diff options
Diffstat (limited to 'data/scripts')
188 files changed, 257 insertions, 257 deletions
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 3ae98443..4ba55575 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -79,7 +79,7 @@ script_08008C5C: DoPostScriptAction 0x000f _0807EB44 0x0004 _0807E930 0x0004 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 SoundReq 0x0121 EndBlock WaitForSomething 0x00000002 diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc index 087bb253..959a01c1 100644 --- a/data/scripts/script_08008F74.inc +++ b/data/scripts/script_08008F74.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08008F74 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00b8, 0x0090 diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc index d0fa9c93..318ebf1f 100644 --- a/data/scripts/script_08008FFC.inc +++ b/data/scripts/script_08008FFC.inc @@ -12,7 +12,7 @@ SCRIPT_START script_08008FFC _0807E930 0x0006 Wait 0x0010 DoPostScriptAction 0x000f - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 _0807ECC4 0x1c20 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index ac832c53..ba813a3f 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -18,7 +18,7 @@ SCRIPT_START script_0800903C .2byte 0x0000 BeginBlock Call sub_0807F348 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0004 DoPostScriptAction 0x0000 _0807E9D4 @@ -120,7 +120,7 @@ script_0800917C: _0807EB74 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0078 _0807EB74 diff --git a/data/scripts/script_08009320.inc b/data/scripts/script_08009320.inc index 77b00bff..6b99a817 100644 --- a/data/scripts/script_08009320.inc +++ b/data/scripts/script_08009320.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08009320 BeginBlock Call sub_0806D650 - SetEntityNonPlanarMovement 0x0010 + SetEntitySpeed 0x0010 EndBlock script_0800932E: _0807EEF4 0xfff8, 0x0000 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index b3865077..25a70cb1 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -17,7 +17,7 @@ SCRIPT_START script_08009464 .2byte 0x0000 BeginBlock Call sub_0806D7C4 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock Wait 0x003c SetEntity0x20 0x00018000 diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc index d9c26006..8d269a34 100644 --- a/data/scripts/script_080094CC.inc +++ b/data/scripts/script_080094CC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080094CC BeginBlock Call sub_0806D804 - SetEntityNonPlanarMovement 0x0180 + SetEntitySpeed 0x0180 EndBlock Wait 0x003c SetEntity0x20 0x00018000 diff --git a/data/scripts/script_08009704.inc b/data/scripts/script_08009704.inc index e3de4497..a37836bb 100644 --- a/data/scripts/script_08009704.inc +++ b/data/scripts/script_08009704.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009704 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x01a0, 0x01b0 _0807EB44 0x0000 @@ -9,7 +9,7 @@ SCRIPT_START script_08009704 Wait 0x003c _0807E5F8 0x00000001 DoPostScriptAction 0x000d - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807ECC4 0x0010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc index 8f1f9439..85d253ee 100644 --- a/data/scripts/script_080097F0.inc +++ b/data/scripts/script_080097F0.inc @@ -2,7 +2,7 @@ SCRIPT_START script_080097F0 BeginBlock _0807E930 0x0003 DoPostScriptAction 0x0007 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc index 2918b662..144383f8 100644 --- a/data/scripts/script_08009838.inc +++ b/data/scripts/script_08009838.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08009838 BeginBlock _0807E930 0x0003 DoPostScriptAction 0x0007 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 Call sub_0807F348 EndBlock WaitForSomething2 0x00000008 diff --git a/data/scripts/script_0800987C.inc b/data/scripts/script_0800987C.inc index 1a1f41bd..d0cc3325 100644 --- a/data/scripts/script_0800987C.inc +++ b/data/scripts/script_0800987C.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800987C _0807EB44 0x0004 SoundReq 0x0086 Call sub_0807F36C - SetEntityNonPlanarMovement 0x0400 + SetEntitySpeed 0x0400 _0807ECF4 0x0004 Call sub_0807F1E8 Wait 0x001e diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc index e6d6e44e..9a01e6c3 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08009950 BeginBlock Call sub_0807F348 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 _0807EB44 0x0004 _0807E930 0x000c _0807E908 0x0003 diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index fef3b8bc..5d6dcffb 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080099DC BeginBlock Call sub_0807F348 - SetEntityNonPlanarMovement 0x00c0 + SetEntitySpeed 0x00c0 _0807EB44 0x0002 DoPostScriptAction 0x0008 EndBlock diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc index 3527bb00..d70c103a 100644 --- a/data/scripts/script_08009A34.inc +++ b/data/scripts/script_08009A34.inc @@ -8,7 +8,7 @@ script_08009A38: Jump script_08009A38 SetEntityPositionRelative 0x0240, 0x0178 CameraTargetEntity - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Wait 0x0078 SoundReq2 0x0036 _0807E778 0x0002 diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc index da26d106..b6d926af 100644 --- a/data/scripts/script_08009A84.inc +++ b/data/scripts/script_08009A84.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08009A84 BeginBlock SetEntityPositionRelative 0x01e8, 0x0110 - SetEntityNonPlanarMovement 0x00c0 + SetEntitySpeed 0x00c0 DoPostScriptAction 0x0008 EndBlock WaitForSomething2 0x00000004 @@ -13,9 +13,9 @@ SCRIPT_START script_08009A84 CameraTargetEntity _0807EDD4 0x0290, 0x0228 _0807EDD4 0x0290, 0x01f8 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EDD4 0x0290, 0x01c8 - SetEntityNonPlanarMovement 0x00c0 + SetEntitySpeed 0x00c0 _0807EDD4 0x0290, 0x0198 Wait 0x001e _0807E5F8 0x00000010 diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index e0f83575..8fd0b8b8 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08009B78 BeginBlock _0807EB44 0x0006 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807E9D4 Call sub_0807F348 EndBlock diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index f78beac8..c9162bc6 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08009C68 BeginBlock _0807EB44 0x0002 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 Call sub_0807F348 EndBlock WaitForSomething2 0x00000004 diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc index 7405c078..aa448258 100644 --- a/data/scripts/script_08009CFC.inc +++ b/data/scripts/script_08009CFC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08009CFC BeginBlock _0807E8E4_1 - SetEntityNonPlanarMovement 0x00c0 + SetEntitySpeed 0x00c0 EndBlock _0807E5F8 0x00000004 DoPostScriptAction 0x0004 diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/script_08009D6C.inc index e66c5519..4b1a4832 100644 --- a/data/scripts/script_08009D6C.inc +++ b/data/scripts/script_08009D6C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08009D6C BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0006 EndBlock _0807EDD4 0x0078, 0x0060 diff --git a/data/scripts/script_0800A088.inc b/data/scripts/script_0800A088.inc index bc76a17f..d24fdd74 100644 --- a/data/scripts/script_0800A088.inc +++ b/data/scripts/script_0800A088.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800A088 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807ECC4 0x0010 _0807EDD4 0x0078, 0x0060 diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc index 3b011d92..5585c44b 100644 --- a/data/scripts/script_0800A0B4.inc +++ b/data/scripts/script_0800A0B4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800A0B4 BeginBlock - SetEntityNonPlanarMovement 0x0140 + SetEntitySpeed 0x0140 _0807E864 Call sub_0807DF28 EndBlock @@ -16,6 +16,6 @@ script_0800A0D2: _0807E5F8 0x00000004 WaitForSomething2 0x00000002 Wait 0x003c - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EC64 0x0030 SCRIPT_END diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc index ea5cf308..52e561c8 100644 --- a/data/scripts/script_0800A160.inc +++ b/data/scripts/script_0800A160.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800A160 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807E930 0x0002 diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc index 1d8c805e..50a0bc11 100644 --- a/data/scripts/script_0800A310.inc +++ b/data/scripts/script_0800A310.inc @@ -13,7 +13,7 @@ SCRIPT_START script_0800A310 .2byte 0x0000 BeginBlock DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x000b _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc index f4260f81..114943d5 100644 --- a/data/scripts/script_0800A3D8.inc +++ b/data/scripts/script_0800A3D8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800A3D8 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807EB44 0x0002 diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc index 332a734a..d9f29737 100644 --- a/data/scripts/script_0800A500.inc +++ b/data/scripts/script_0800A500.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800A500 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807E930 0x0005 diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc index 13e7d09e..4a6dd099 100644 --- a/data/scripts/script_0800A590.inc +++ b/data/scripts/script_0800A590.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800A590 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 SetEntity0x20 0x00000000 DoPostScriptAction 0x0008 _0807EB44 0x0000 diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc index 5fa1b6a4..8b08a0c0 100644 --- a/data/scripts/script_0800ACBC.inc +++ b/data/scripts/script_0800ACBC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800ACBC BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0088, 0x0080 _0807EB44 0x0000 diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc index e191815b..03b12d66 100644 --- a/data/scripts/script_0800AD54.inc +++ b/data/scripts/script_0800AD54.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800AD54 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock _0807EC64 0x0020 _0807EB44 0x0000 @@ -8,7 +8,7 @@ SCRIPT_START script_0800AD54 _0807E5F8 0x00000001 Call sub_080791BC BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807EB44 0x0004 @@ -53,7 +53,7 @@ SCRIPT_START script_0800AD54 Wait 0x001e _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xfff0 Wait 0x003c _0807EEF4 0x0000, 0xfff0 diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/script_0800AEA4.inc index 8dee61d5..07fc508d 100644 --- a/data/scripts/script_0800AEA4.inc +++ b/data/scripts/script_0800AEA4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800AEA4 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807EB44 0x0002 diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/script_0800AEDC.inc index 85c122f3..15b0a526 100644 --- a/data/scripts/script_0800AEDC.inc +++ b/data/scripts/script_0800AEDC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800AEDC BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807E930 0x0000 diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/script_0800B1C0.inc index 293b95d5..429afa66 100644 --- a/data/scripts/script_0800B1C0.inc +++ b/data/scripts/script_0800B1C0.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800B1C0 DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x00e0 + SetEntitySpeed 0x00e0 _0807EDD4 0x0088, 0x0090 ClearLocalFlag 0x0039 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800B200.inc b/data/scripts/script_0800B200.inc index 10efa475..3dfffa93 100644 --- a/data/scripts/script_0800B200.inc +++ b/data/scripts/script_0800B200.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800B200 _0807E5F8 0x00000000 CheckLocalFlag 0x001d JumpIf script_0800B252 - SetEntityNonPlanarMovement 0x00c0 + SetEntitySpeed 0x00c0 EndBlock script_0800B216: WaitForSomething2 0x00000001 diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc index aa0f455a..4163885a 100644 --- a/data/scripts/script_0800B308.inc +++ b/data/scripts/script_0800B308.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800B308 CheckLocalFlag 0x001d JumpIf script_0800B39C DoPostScriptAction 0x0001 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 SetEntityDirection 0x0010 CheckKinstoneFused 0x0006 JumpIfNot script_0800B32C diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc index ff9dd344..29a0db43 100644 --- a/data/scripts/script_0800B3A4.inc +++ b/data/scripts/script_0800B3A4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800B3A4 BeginBlock DoPostScriptAction 0x000a Call sub_0807F158 - SetEntityNonPlanarMovement 0x0120 + SetEntitySpeed 0x0120 _0807EB44 0x0004 _0807E908 0x0002 SetIntVariable 0x0000200a diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index 1abdb55f..6af14ec8 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800B41C BeginBlock - SetEntityNonPlanarMovement 0x00c0 + SetEntitySpeed 0x00c0 _0807E908 0x0001 DoPostScriptAction 0x000b _0807E864 diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index 552c3aa0..26fc3d9a 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800B4AC BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0001 - SetEntityNonPlanarMovement 0x00c0 + SetEntitySpeed 0x00c0 _0807E9D4 script_0800B4BC: EndBlock diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/script_0800B54C.inc index 81c16ece..cb550b60 100644 --- a/data/scripts/script_0800B54C.inc +++ b/data/scripts/script_0800B54C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800B54C BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0128, 0x0298 Wait 0x000a diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc index 45b307ad..45c39e1e 100644 --- a/data/scripts/script_0800B5C4.inc +++ b/data/scripts/script_0800B5C4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800B5C4 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0004 EndBlock Wait 0x001e diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc index 6841ae66..b9f32d34 100644 --- a/data/scripts/script_0800B7C4.inc +++ b/data/scripts/script_0800B7C4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800B7C4 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock CallWithArg sub_0807F6B4, 0x00000090 JumpIfNot script_0800B7FC diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 16313d57..1a1519f2 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -61,7 +61,7 @@ script_0800BA6C: BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 Call sub_0807F348 EndBlock script_0800BA8E: diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index 60ce3a02..8bc8cba9 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800BB64 BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 Call sub_0807F348 EndBlock script_0800BB7A: diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index ec6f2a37..2cc1a6d6 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -19,7 +19,7 @@ script_0800BC62: Call sub_08054EFC _0807EB44 0x0000 _0807E930 0x0000 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 DoPostScriptAction 0x000d CallWithArg sub_0807F4F8, 0x00000378 Wait 0x003c diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index bf86bcf4..1d4a66b4 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -32,6 +32,6 @@ script_0800BD1C: Wait 0x003c _0807EB44 0x0002 WaitForSomething2 0x00000004 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index 7d668cc2..3b4f628f 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800BD78 _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 @@ -14,7 +14,7 @@ SCRIPT_START script_0800BD78 _0807EA94 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0088, 0x0228 Wait 0x000f _0807E5F8 0x00000004 @@ -29,7 +29,7 @@ SCRIPT_START script_0800BD78 Wait 0x003c _0807EB44 0x0006 _0807E5F8 0x00000004 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index e620c95e..a57fbd89 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800BECC _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 @@ -14,7 +14,7 @@ SCRIPT_START script_0800BECC _0807EA94 _0807E5F8 0x0000000c WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0088, 0x0178 Wait 0x000f _0807E5F8 0x0000000c diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index 7b131db4..c136745f 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -50,6 +50,6 @@ script_0800BFA8: _0807E930 0x0000 Wait 0x003c Call sub_08054F64 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index 990a55df..da82fbf0 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800C004 _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 @@ -14,7 +14,7 @@ SCRIPT_START script_0800C004 _0807EA94 _0807E5F8 0x0000001c WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0088, 0x0188 _0807EDD4 0x00a8, 0x0188 _0807EDD4 0x00a8, 0x0178 @@ -30,7 +30,7 @@ SCRIPT_START script_0800C004 _0807E930 0x0000 Wait 0x003c _0807E5F8 0x0000001c - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 7fe378ae..3df5f2f1 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800C160 _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 @@ -14,7 +14,7 @@ SCRIPT_START script_0800C160 _0807EA94 _0807E5F8 0x0000003c WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0098, 0x00e8 _0807EDD4 0x00a8, 0x00e8 _0807EDD4 0x00a8, 0x00d8 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index 98163565..9eaf26a5 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -50,6 +50,6 @@ script_0800C248: _0807E930 0x0000 Wait 0x003c Call sub_08054F64 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index 7853cf4b..02d68b9c 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -3,7 +3,7 @@ SCRIPT_START script_0800C2A4 _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock WaitForSomething2 0x00000002 @@ -14,7 +14,7 @@ SCRIPT_START script_0800C2A4 _0807EA94 _0807E5F8 0x0000007c WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0098, 0x00e8 _0807EDD4 0x00c8, 0x00e8 _0807EDD4 0x00c8, 0x00d8 @@ -30,7 +30,7 @@ SCRIPT_START script_0800C2A4 _0807E930 0x0000 Wait 0x003c _0807E5F8 0x0000007c - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800C350.inc b/data/scripts/script_0800C350.inc index e9df34fd..fd0d06d5 100644 --- a/data/scripts/script_0800C350.inc +++ b/data/scripts/script_0800C350.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C350 BeginBlock CallWithArg sub_0806D658, 0x00000003 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 EndBlock script_0800C362: CheckRoomFlag 0x00ff diff --git a/data/scripts/script_0800C3B0.inc b/data/scripts/script_0800C3B0.inc index 95da6f56..7c2582f8 100644 --- a/data/scripts/script_0800C3B0.inc +++ b/data/scripts/script_0800C3B0.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800C3B0 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xff30 _0807F0C8 0x0000, 0x0000 Wait 0x00b4 diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc index 4c20b2fa..54d6aa9b 100644 --- a/data/scripts/script_0800C3CC.inc +++ b/data/scripts/script_0800C3CC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C3CC BeginBlock Call sub_0806D660 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock WaitForSomething2 0x00000002 CallWithArg sub_0807F4F8, 0x00000048 diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc index 42903575..4e3767b4 100644 --- a/data/scripts/script_0800C410.inc +++ b/data/scripts/script_0800C410.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C410 BeginBlock Call sub_0806D660 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock WaitForSomething2 0x00000004 CallWithArg sub_0807F4F8, 0x00000048 diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc index d1078766..5c8767cc 100644 --- a/data/scripts/script_0800C45C.inc +++ b/data/scripts/script_0800C45C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800C45C BeginBlock - SetEntityNonPlanarMovement 0x0180 + SetEntitySpeed 0x0180 _0807E930 0x0004 Call sub_080A0B28 EndBlock diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc index 5aa15f03..f35af231 100644 --- a/data/scripts/script_0800C494.inc +++ b/data/scripts/script_0800C494.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800C494 BeginBlock - SetEntityNonPlanarMovement 0x0120 + SetEntitySpeed 0x0120 _0807E930 0x0004 EndBlock Wait 0x000a diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc index 5186a76a..6365aa7e 100644 --- a/data/scripts/script_0800C4D0.inc +++ b/data/scripts/script_0800C4D0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800C4D0 BeginBlock - SetEntityNonPlanarMovement 0x0180 + SetEntitySpeed 0x0180 _0807E930 0x0004 EndBlock Wait 0x000a diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc index 49086ad3..0c8bc2b1 100644 --- a/data/scripts/script_0800C50C.inc +++ b/data/scripts/script_0800C50C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800C50C BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807E930 0x0004 DoPostScriptAction 0x0008 EndBlock diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 5e110933..bcd1f208 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -81,7 +81,7 @@ script_0800C61E: Jump script_0800C60A BeginBlock DoPostScriptAction 0x000a - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EB44 0x0004 CheckLocalFlag 0x0082 JumpIfNot script_0800C650 @@ -226,7 +226,7 @@ script_0800C824: JumpIf script_0800C8AE TextboxNoOverlapFollow 0x1135 _0807EA94 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 _0807EDD4 0x0038, 0x0044 DoPostScriptAction 0x0000 Wait 0x000f diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/script_0800C8C8.inc index 170a566c..b5a97320 100644 --- a/data/scripts/script_0800C8C8.inc +++ b/data/scripts/script_0800C8C8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800C8C8 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00e8, 0x0068 _0807EB44 0x0000 diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/script_0800C8F0.inc index 609bddbd..4cfdb12b 100644 --- a/data/scripts/script_0800C8F0.inc +++ b/data/scripts/script_0800C8F0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800C8F0 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807ECC4 0x0010 _0807EDD4 0x0078, 0x0058 diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index 094b43f3..3c5d833e 100644 --- a/data/scripts/script_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C91C BeginBlock _0807EB44 0x0004 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 EndBlock script_0800C928: CheckPlayerInRegion 0x0208, 0x0360, 0x2040 diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc index a2429daa..bccf4699 100644 --- a/data/scripts/script_0800CA8C.inc +++ b/data/scripts/script_0800CA8C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800CA8C BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0208, 0x0358 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EDD4 0x0208, 0x0340 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc index 67cac527..0387d84e 100644 --- a/data/scripts/script_0800CABC.inc +++ b/data/scripts/script_0800CABC.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800CABC BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock @@ -19,13 +19,13 @@ SCRIPT_START script_0800CABC _0807EF3C 0x0180, 0x0030 _0807E5F8 0x00000400 WaitForSomething2 0x00000200 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x0208, 0x0328 DoPostScriptAction 0x0000 _0807E5F8 0x00000400 WaitForSomething2 0x00000200 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0208, 0x02b0 _0807E5F8 0x00000400 diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc index 206ad5fb..b94d1c74 100644 --- a/data/scripts/script_0800CB54.inc +++ b/data/scripts/script_0800CB54.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800CB54 BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock @@ -15,13 +15,13 @@ SCRIPT_START script_0800CB54 DoPostScriptAction 0x0000 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x01f8, 0x0348 DoPostScriptAction 0x0000 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0178, 0x0328 _0807E5F8 0x00001000 diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc index 32847309..1ba664af 100644 --- a/data/scripts/script_0800CBD4.inc +++ b/data/scripts/script_0800CBD4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800CBD4 BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock @@ -13,7 +13,7 @@ SCRIPT_START script_0800CBD4 DoPostScriptAction 0x0000 _0807E5F8 0x00004000 WaitForSomething2 0x00002000 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x0218, 0x0340 DoPostScriptAction 0x0000 @@ -25,7 +25,7 @@ SCRIPT_START script_0800CBD4 _0807EF3C 0x0180, 0x0030 _0807E5F8 0x00004000 WaitForSomething2 0x00002000 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0288, 0x02d8 _0807E5F8 0x00004000 diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc index ffeff6d3..81dde4c6 100644 --- a/data/scripts/script_0800CC6C.inc +++ b/data/scripts/script_0800CC6C.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800CC6C BeginBlock DoPostScriptAction 0x0008 DoPostScriptAction 0x0000 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock @@ -13,7 +13,7 @@ SCRIPT_START script_0800CC6C DoPostScriptAction 0x0000 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x01f8, 0x0330 DoPostScriptAction 0x0000 @@ -25,7 +25,7 @@ SCRIPT_START script_0800CC6C _0807EF3C 0x0180, 0x0030 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0188, 0x02d8 _0807E5F8 0x00010000 diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc index c25ec6ca..78b981d4 100644 --- a/data/scripts/script_0800CD04.inc +++ b/data/scripts/script_0800CD04.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800CD04 BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock @@ -13,13 +13,13 @@ SCRIPT_START script_0800CD04 DoPostScriptAction 0x0000 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x0218, 0x0350 DoPostScriptAction 0x0000 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x02a8, 0x0328 _0807E5F8 0x00040000 diff --git a/data/scripts/script_0800D190.inc b/data/scripts/script_0800D190.inc index 69e087fe..e280400d 100644 --- a/data/scripts/script_0800D190.inc +++ b/data/scripts/script_0800D190.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800D190 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0170, 0x0140 _0807EB44 0x0002 diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc index 855279ca..4a7bb3c8 100644 --- a/data/scripts/script_0800D1B4.inc +++ b/data/scripts/script_0800D1B4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800D1B4 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0170, 0x0120 _0807EDD4 0x01a8, 0x0120 diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index 4f5fdc32..16ef4204 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -88,7 +88,7 @@ script_0800D372: CheckLocalFlag 0x007e JumpIfNot script_0800D3E4 DoPostScriptAction 0x000b - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 CheckPlayerInRegion 0x0090, 0x0130, 0x0810 JumpIfNot script_0800D3B2 StartPlayerScript script_0800D3EC diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc index 95b38e48..ed99e4a7 100644 --- a/data/scripts/script_0800D3EC.inc +++ b/data/scripts/script_0800D3EC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800D3EC BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc index fac4b733..d1901242 100644 --- a/data/scripts/script_0800D414.inc +++ b/data/scripts/script_0800D414.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800D414 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 Call sub_08068104 DoPostScriptAction 0x000a EndBlock @@ -147,7 +147,7 @@ script_0800D650: Call sub_0807DF28 Call sub_0807FBC4 Call sub_0807FBA0 - SetEntityNonPlanarMovement 0x0700 + SetEntitySpeed 0x0700 _0807F0B4 0x0007 CameraTargetEntity _0807EDD4 0x01e8, 0x01b8 diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc index f5787251..b2ce1c33 100644 --- a/data/scripts/script_0800D710.inc +++ b/data/scripts/script_0800D710.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D710 BeginBlock Call sub_0807F360 - SetEntityNonPlanarMovement 0x0700 + SetEntitySpeed 0x0700 _0807F0B4 0x0007 CameraTargetEntity Call sub_0807FBC4 diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc index c676c9df..e81cc3d9 100644 --- a/data/scripts/script_0800D76C.inc +++ b/data/scripts/script_0800D76C.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800D76C BeginBlock Call sub_0807F360 DoPostScriptAction 0x000b - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock @@ -27,14 +27,14 @@ SCRIPT_START script_0800D76C Call sub_0807F360 DoPostScriptAction 0x000b SetEntityPositionRelative 0x0268, 0x01d8 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock WaitForSomething2 0x00000002 _0807EDD4 0x01f0, 0x01d8 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 script_0800D80C: - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0xffe0 DoPostScriptAction 0x000e Call sub_0806CA5C diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/script_0800D92C.inc index ec1171f4..2ad1c0b1 100644 --- a/data/scripts/script_0800D92C.inc +++ b/data/scripts/script_0800D92C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800D92C BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00a0, 0x0078 diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/script_0800DA00.inc index fb8ca4a8..9f15202c 100644 --- a/data/scripts/script_0800DA00.inc +++ b/data/scripts/script_0800DA00.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DA00 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0118, 0x0060 diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc index cd2daa3f..042eae3c 100644 --- a/data/scripts/script_0800DA28.inc +++ b/data/scripts/script_0800DA28.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DA28 BeginBlock DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock WaitForSomething2 0x00000004 DoPostScriptAction 0x0007 diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc index 582e4f0d..c3bef3db 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -37,7 +37,7 @@ script_0800DCD0: Wait 0x003c _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -62,7 +62,7 @@ script_0800DCD0: DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0x0080 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc index 8f6197ab..c8ca954c 100644 --- a/data/scripts/script_0800DDD0.inc +++ b/data/scripts/script_0800DDD0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DDD0 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock CallWithArg sub_0807F4F8, 0x000000a0 _0807EDD4 0x0078, 0x00a0 diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc index cda0a5f9..e8c74e5f 100644 --- a/data/scripts/script_0800DE00.inc +++ b/data/scripts/script_0800DE00.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DE00 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EB44 0x0000 DoPostScriptAction 0x000d diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/script_0800DE2C.inc index d637c711..125cf382 100644 --- a/data/scripts/script_0800DE2C.inc +++ b/data/scripts/script_0800DE2C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DE2C BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/script_0800DEB0.inc index 5ea6b35a..5ae10991 100644 --- a/data/scripts/script_0800DEB0.inc +++ b/data/scripts/script_0800DEB0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DEB0 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0198, 0x01c8 _0807EB44 0x0004 diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc index d3aa6911..8a4dc2fd 100644 --- a/data/scripts/script_0800DED4.inc +++ b/data/scripts/script_0800DED4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800DED4 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x000b Call sub_08066D04 EndBlock diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc index c3a946ef..a3891eab 100644 --- a/data/scripts/script_0800E094.inc +++ b/data/scripts/script_0800E094.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E094 BeginBlock - SetEntityNonPlanarMovement 0x00c0 + SetEntitySpeed 0x00c0 EndBlock WaitForSomething2 0x00000001 DoPostScriptAction 0x0001 diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index 5afb7a99..8ca8ff20 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -93,7 +93,7 @@ script_0800E1E0: _0807E878 Jump script_0800E1E0 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0073 diff --git a/data/scripts/script_0800E600.inc b/data/scripts/script_0800E600.inc index 13ed8190..282b2a6d 100644 --- a/data/scripts/script_0800E600.inc +++ b/data/scripts/script_0800E600.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E600 BeginBlock - SetEntityNonPlanarMovement 0x0140 + SetEntitySpeed 0x0140 SetEntityDirection 0x0000 _0807E864 Call sub_0807F354 diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/script_0800E62C.inc index 3400590c..1e325aeb 100644 --- a/data/scripts/script_0800E62C.inc +++ b/data/scripts/script_0800E62C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E62C BeginBlock - SetEntityNonPlanarMovement 0x0140 + SetEntitySpeed 0x0140 SetEntityDirection 0x0008 _0807E864 Call sub_0807F354 diff --git a/data/scripts/script_0800E658.inc b/data/scripts/script_0800E658.inc index d72f1ad6..3368222f 100644 --- a/data/scripts/script_0800E658.inc +++ b/data/scripts/script_0800E658.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E658 BeginBlock - SetEntityNonPlanarMovement 0x0140 + SetEntitySpeed 0x0140 SetEntityDirection 0x0010 _0807E864 Call sub_0807F354 diff --git a/data/scripts/script_0800E684.inc b/data/scripts/script_0800E684.inc index bdb35605..1f12e319 100644 --- a/data/scripts/script_0800E684.inc +++ b/data/scripts/script_0800E684.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E684 BeginBlock - SetEntityNonPlanarMovement 0x0140 + SetEntitySpeed 0x0140 SetEntityDirection 0x0018 _0807E864 Call sub_0807F354 diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index e7c074fe..049dc195 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -62,7 +62,7 @@ script_0800E73E: BeginBlock _0807E9D4 DoPostScriptAction 0x000a - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 CheckGlobalFlag 0x0029 JumpIfNot script_0800E77C CheckGlobalFlag 0x002a diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/script_0800E9F4.inc index 69dc9e0b..1c1b1d22 100644 --- a/data/scripts/script_0800E9F4.inc +++ b/data/scripts/script_0800E9F4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E9F4 BeginBlock _0807EB44 0x0004 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0078, 0x0080 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index 87291df6..f432b00a 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -166,7 +166,7 @@ script_0800EC6C: BeginBlock _0807E9D4 CallWithArg sub_08061FB8, 0x00000001 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0002 diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc index a246d1fe..6e1be5e2 100644 --- a/data/scripts/script_0800EF9C.inc +++ b/data/scripts/script_0800EF9C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800EF9C BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0001 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index ba645685..bec9c5ec 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800EFC0 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807E9D4 DoPostScriptAction 0x000a CheckLocalFlag 0x007b diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/script_0800F14C.inc index b13edcab..30be825a 100644 --- a/data/scripts/script_0800F14C.inc +++ b/data/scripts/script_0800F14C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800F14C BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0000 _0807EB44 0x0006 diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index 4e4cbb74..b9ef9e66 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800F184 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0008 DoPostScriptAction 0x000a EndBlock @@ -105,7 +105,7 @@ script_0800F314: EndBlock _0807E5F8 0x00000040 WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0002 _0807EEF4 0x00c0, 0x0000 _0807E5F8 0x00000040 diff --git a/data/scripts/script_0800F33C.inc b/data/scripts/script_0800F33C.inc index cf83ab8e..11c63b10 100644 --- a/data/scripts/script_0800F33C.inc +++ b/data/scripts/script_0800F33C.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800F33C - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EC94 0x0008 _0807E5F8 0x00000400 Call sub_080791BC diff --git a/data/scripts/script_0800F354.inc b/data/scripts/script_0800F354.inc index 30e7f1ef..4a43ec65 100644 --- a/data/scripts/script_0800F354.inc +++ b/data/scripts/script_0800F354.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800F354 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807ECF4 0x0008 _0807E5F8 0x00000400 Call sub_080791BC diff --git a/data/scripts/script_0800F36C.inc b/data/scripts/script_0800F36C.inc index e3192b28..7fb077c6 100644 --- a/data/scripts/script_0800F36C.inc +++ b/data/scripts/script_0800F36C.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800F36C - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807ECC4 0x0008 _0807E5F8 0x00000400 Call sub_080791BC diff --git a/data/scripts/script_0800F384.inc b/data/scripts/script_0800F384.inc index 38780c9b..488420ce 100644 --- a/data/scripts/script_0800F384.inc +++ b/data/scripts/script_0800F384.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800F384 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EC64 0x0008 _0807E5F8 0x00000400 Call sub_080791BC diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index 271e6083..d492c9ee 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800F39C _0807EB44 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x000b EndBlock Call sub_0807F348 @@ -34,7 +34,7 @@ script_0800F402: EndBlock DoPostScriptAction 0x000b Wait 0x0010 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EC64 0x0010 _0807EDD4 0x0288, 0x0328 _0807E5F8 0x00000080 diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index 023bf67d..3f822589 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800F430 _0807EB44 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x000b EndBlock Call sub_0807F348 @@ -33,7 +33,7 @@ script_0800F490: EndBlock DoPostScriptAction 0x000b Wait 0x0018 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EC94 0x0010 _0807EC64 0x0020 _0807EDD4 0x0288, 0x0328 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index 4d285fdc..958ffa77 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800F4C4 _0807EB44 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x000b EndBlock Call sub_0807F348 @@ -33,7 +33,7 @@ script_0800F524: EndBlock DoPostScriptAction 0x000b Wait 0x0028 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EC64 0x0010 _0807EDD4 0x0288, 0x0328 _0807E5F8 0x00000200 diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/script_0800FA54.inc index 076c3a6c..bb03b3ad 100644 --- a/data/scripts/script_0800FA54.inc +++ b/data/scripts/script_0800FA54.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800FA54 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock SetEntityPositionRelative 0x00d8, 0x0398 _0807EB44 0x0006 diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/script_0800FA78.inc index d9444222..6da1cdb1 100644 --- a/data/scripts/script_0800FA78.inc +++ b/data/scripts/script_0800FA78.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800FA78 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00a0, 0x0278 _0807EB44 0x0000 diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/script_0800FA9C.inc index 4e9ffa05..32d80aea 100644 --- a/data/scripts/script_0800FA9C.inc +++ b/data/scripts/script_0800FA9C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800FA9C BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0078, 0x01c0 _0807EB44 0x0000 diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/script_0800FAC0.inc index bca6c339..9ca12a8a 100644 --- a/data/scripts/script_0800FAC0.inc +++ b/data/scripts/script_0800FAC0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800FAC0 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0108, 0x01c8 _0807EB44 0x0002 diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc index 22643bc1..0db32cf2 100644 --- a/data/scripts/script_0800FAE4.inc +++ b/data/scripts/script_0800FAE4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800FAE4 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock Call sub_0807F584 JumpTable script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/script_0800FB44.inc index eb52579c..cfc3e949 100644 --- a/data/scripts/script_0800FB44.inc +++ b/data/scripts/script_0800FB44.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800FB44 BeginBlock DoPostScriptAction 0x0008 DoPostScriptAction 0x000b - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_08066D04 EndBlock WaitForSomething2 0x00000002 @@ -16,7 +16,7 @@ script_0800FB6C: DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 _0807EDD4 0x00b8, 0x0318 SetEntityPositionRelative 0x00a0, 0x0260 _0807EB44 0x0000 @@ -34,7 +34,7 @@ script_0800FBAE: DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 _0807EDD4 0x00a0, 0x0268 _0807EDD4 0x0070, 0x0268 _0807EDD4 0x0070, 0x0208 @@ -53,7 +53,7 @@ script_0800FC06: DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 _0807EDD4 0x00f8, 0x01a8 SetEntityPositionRelative 0x0118, 0x01c8 _0807EB44 0x0002 @@ -70,7 +70,7 @@ script_0800FC52: DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 _0807EDD4 0x0118, 0x0260 SetEntityPositionRelative 0x00f8, 0x0270 _0807EB44 0x0000 @@ -87,14 +87,14 @@ script_0800FC9E: DoPostScriptAction 0x0004 WaitForSomething2 0x00000002 DoPostScriptAction 0x000d - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 _0807EC94 0x0020 _0807EB44 0x0000 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 DoPostScriptAction 0x000c - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 _0807ECF4 0x0020 _0807EB44 0x0006 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FD80.inc b/data/scripts/script_0800FD80.inc index 69ac239e..2d707a67 100644 --- a/data/scripts/script_0800FD80.inc +++ b/data/scripts/script_0800FD80.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800FD80 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EC64 0x0020 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc index 15f53ddd..fd161ece 100644 --- a/data/scripts/script_0800FDA0.inc +++ b/data/scripts/script_0800FDA0.inc @@ -20,7 +20,7 @@ script_0800FDB2: DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 EndBlock script_0800FDE2: Call sub_08069A60 @@ -56,7 +56,7 @@ script_0800FE06: DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 EndBlock script_0800FE5A: Call sub_08069AA8 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 91997467..c74dadee 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -56,7 +56,7 @@ script_08010014: _0807EA94 _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x0000000c - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0018, 0x0108 _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000008 diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc index 99e7d042..dd5e7093 100644 --- a/data/scripts/script_080109F0.inc +++ b/data/scripts/script_080109F0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080109F0 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807ECC4 0x0010 _0807EB44 0x0004 diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc index d3ecbef6..6d0a7712 100644 --- a/data/scripts/script_08010A14.inc +++ b/data/scripts/script_08010A14.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08010A14 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EC64 0x0010 _0807EB44 0x0000 diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc index 2f5dcc02..36c00b7c 100644 --- a/data/scripts/script_08010A38.inc +++ b/data/scripts/script_08010A38.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08010A38 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EC94 0x0010 _0807EB44 0x0002 diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc index 6201c14e..78022f8b 100644 --- a/data/scripts/script_08010A98.inc +++ b/data/scripts/script_08010A98.inc @@ -22,7 +22,7 @@ script_08010AB4: JumpIfNot script_08010B62 _0807EB44 0x0004 DoPostScriptAction 0x0000 - SetEntityNonPlanarMovement 0x0180 + SetEntitySpeed 0x0180 CallWithArg sub_0807F348 Call sub_0806075C EndBlock diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index b2c8633f..34745b7b 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -90,7 +90,7 @@ script_08010BCA: WaitForSomething2 0x00500000 _0807E5F8 0x00000100 SetEntityPositionRelative 0x01f8, 0x0220 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x01f8, 0x0098 Wait 0x003c WaitForSomething2 0x00000200 diff --git a/data/scripts/script_08011074.inc b/data/scripts/script_08011074.inc index a127e6c2..43df8c6b 100644 --- a/data/scripts/script_08011074.inc +++ b/data/scripts/script_08011074.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08011074 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock _0807EDD4 0x01e8, 0x0050 _0807EB44 0x0000 diff --git a/data/scripts/script_080110BC.inc b/data/scripts/script_080110BC.inc index bf562d30..7ca7f0c1 100644 --- a/data/scripts/script_080110BC.inc +++ b/data/scripts/script_080110BC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080110BC BeginBlock - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 EndBlock - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x0068 _0807EB44 0x0004 diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc index 11113c53..03f283c4 100644 --- a/data/scripts/script_080110E8.inc +++ b/data/scripts/script_080110E8.inc @@ -4,7 +4,7 @@ SCRIPT_START script_080110E8 DoPostScriptAction 0x000d SoundReq 0x0086 Call sub_0807F36C - SetEntityNonPlanarMovement 0x0400 + SetEntitySpeed 0x0400 _0807ECF4 0x0008 BeginBlock Call sub_0807F1E8 diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc index 48c4f798..c8e34389 100644 --- a/data/scripts/script_08011128.inc +++ b/data/scripts/script_08011128.inc @@ -19,7 +19,7 @@ script_08011134: _0807EB44 0x0004 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807ECC4 0x0010 DoPostScriptAction 0x0000 @@ -29,7 +29,7 @@ script_08011134: Wait 0x001e DoPostScriptAction 0x0010 Call sub_0807F3C8 - SetEntityNonPlanarMovement 0x0400 + SetEntitySpeed 0x0400 SetEntityDirection 0x001c _0807EC1C 0x003c _0807E5F8 0x00000008 diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc index 3aa09161..8756d389 100644 --- a/data/scripts/script_080111CC.inc +++ b/data/scripts/script_080111CC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080111CC BeginBlock DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 Call sub_08066D04 EndBlock Call sub_0807F338 @@ -28,7 +28,7 @@ script_08011206: WaitForSomething2 0x00000010 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 _0807EDD4 0x01e8, 0x0040 DoPostScriptAction 0x0000 _0807E5F8 0x00000020 diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc index 6f573aa7..2fa640e4 100644 --- a/data/scripts/script_080112C4.inc +++ b/data/scripts/script_080112C4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080112C4 BeginBlock DoPostScriptAction 0x0008 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 Call sub_08095244 Call sub_0807F338 EndBlock @@ -33,7 +33,7 @@ script_08011312: SoundReq 0x011e Wait 0x003c _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x01f0, 0x0098 _0807EDD4 0x01f0, 0x00c8 _0807E930 0x0013 @@ -44,7 +44,7 @@ script_08011312: DoPostScriptAction 0x0010 Call sub_0807F3C8 _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0400 + SetEntitySpeed 0x0400 SetEntityDirection 0x001e _0807EC1C 0x003c _0807E5F8 0x00001000 diff --git a/data/scripts/script_080113AA.inc b/data/scripts/script_080113AA.inc index 2be66000..847d0cf9 100644 --- a/data/scripts/script_080113AA.inc +++ b/data/scripts/script_080113AA.inc @@ -15,7 +15,7 @@ SCRIPT_START script_080113AA SoundReq 0x011e Wait 0x003c _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0200, 0x0098 _0807EDD4 0x0200, 0x00c8 _0807E930 0x0013 @@ -26,7 +26,7 @@ SCRIPT_START script_080113AA DoPostScriptAction 0x0010 Call sub_0807F3C8 _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0400 + SetEntitySpeed 0x0400 SetEntityDirection 0x0002 _0807EC1C 0x003c _0807E5F8 0x00004000 diff --git a/data/scripts/script_08011442.inc b/data/scripts/script_08011442.inc index 3aaa70e7..f2eb4214 100644 --- a/data/scripts/script_08011442.inc +++ b/data/scripts/script_08011442.inc @@ -18,16 +18,16 @@ SCRIPT_START script_08011442 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x01e8, 0x0098 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 _0807E930 0x0013 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 DoPostScriptAction 0x000d _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0020 + SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 _0807E930 0x0013 DoPostScriptAction 0x0010 @@ -35,7 +35,7 @@ SCRIPT_START script_08011442 WaitForSomething2 0x00008000 Call sub_0807F3C8 _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0400 + SetEntitySpeed 0x0400 SetEntityDirection 0x001e _0807EC1C 0x003c _0807E5F8 0x00010000 diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc index fa5574e6..bc282731 100644 --- a/data/scripts/script_08011508.inc +++ b/data/scripts/script_08011508.inc @@ -18,16 +18,16 @@ SCRIPT_START script_08011508 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0208, 0x0098 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 _0807E930 0x0013 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 DoPostScriptAction 0x000d _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0020 + SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 _0807E930 0x0013 DoPostScriptAction 0x0010 @@ -35,7 +35,7 @@ SCRIPT_START script_08011508 WaitForSomething2 0x00020000 Call sub_0807F3C8 _0807E930 0x0014 - SetEntityNonPlanarMovement 0x0400 + SetEntitySpeed 0x0400 SetEntityDirection 0x0002 _0807EC1C 0x003c _0807E5F8 0x00040000 diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc index aa1bdf6e..ee570b92 100644 --- a/data/scripts/script_080115D0.inc +++ b/data/scripts/script_080115D0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080115D0 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0002 _0807E930 0x0001 EndBlock diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc index c879f4a3..957a381c 100644 --- a/data/scripts/script_08011608.inc +++ b/data/scripts/script_08011608.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08011608 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0006 _0807E930 0x0003 EndBlock diff --git a/data/scripts/script_08011640.inc b/data/scripts/script_08011640.inc index 479e22ac..13deb024 100644 --- a/data/scripts/script_08011640.inc +++ b/data/scripts/script_08011640.inc @@ -2,13 +2,13 @@ SCRIPT_START script_08011640 BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock Call sub_0807F338 WaitForSomething2 0x00000040 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 _0807EDD4 0x01f8, 0x0048 DoPostScriptAction 0x0000 _0807E5F8 0x00000080 @@ -17,7 +17,7 @@ SCRIPT_START script_08011640 Wait 0x001e DoPostScriptAction 0x0010 Call sub_0807F3C8 - SetEntityNonPlanarMovement 0x0400 + SetEntitySpeed 0x0400 SetEntityDirection 0x0008 _0807EC1C 0x003c _0807E5F8 0x00000080 diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc index dd4be295..f931651a 100644 --- a/data/scripts/script_080116A8.inc +++ b/data/scripts/script_080116A8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080116A8 BeginBlock _0807EB44 0x0000 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock Call sub_0807F338 WaitForSomething2 0x00000100 @@ -41,7 +41,7 @@ SCRIPT_START script_080116A8 DoPostScriptAction 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x00a8 _0807EB44 0x0000 @@ -61,7 +61,7 @@ SCRIPT_START script_080116A8 DoPostScriptAction 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0098 _0807EB44 0x0000 diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc index 44128a3c..3c6c2c90 100644 --- a/data/scripts/script_08011890.inc +++ b/data/scripts/script_08011890.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08011890 BeginBlock _0807E930 0x0000 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 EndBlock diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc index 178ed17f..5c14c403 100644 --- a/data/scripts/script_080118D4.inc +++ b/data/scripts/script_080118D4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080118D4 BeginBlock _0807E930 0x0000 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 EndBlock diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc index 1d89d4c4..089683a3 100644 --- a/data/scripts/script_08012410.inc +++ b/data/scripts/script_08012410.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012410 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0004 Wait 0x003c diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index ae7f743b..90957ad6 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080126FC BeginBlock - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 DoPostScriptAction 0x0007 EndBlock _0807E930 0x0020 @@ -111,7 +111,7 @@ script_08012824: TextboxNoOverlapFollowPos 0x110e, 0x000c _0807EA94 _0807E930 0x0018 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0806D908 _0807EC1C 0x0010 DoPostScriptAction 0x000a @@ -146,7 +146,7 @@ script_0801293A: _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110f, 0x000c _0807E930 0x0018 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0806D908 _0807EC1C 0x0050 _0807EA94 @@ -182,7 +182,7 @@ script_080129BA: _0807E930 0x0010 TextboxNoOverlapFollowPos 0x1110, 0x000c _0807E930 0x0018 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0806D908 _0807EC1C 0x0050 _0807E930 0x0018 @@ -221,7 +221,7 @@ script_08012A3E: _0807E930 0x0010 TextboxNoOverlapFollowPos 0x1111, 0x000c _0807E930 0x0018 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0806D8A0 script_08012A74: _0807EE30 diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc index cdd07661..9600c570 100644 --- a/data/scripts/script_08012AC8.inc +++ b/data/scripts/script_08012AC8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012AC8 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/script_08012AF0.inc index 5218b68d..3e4b36e6 100644 --- a/data/scripts/script_08012AF0.inc +++ b/data/scripts/script_08012AF0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012AF0 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0388, 0x0180 diff --git a/data/scripts/script_08012B24.inc b/data/scripts/script_08012B24.inc index a5adfb9a..4790ca98 100644 --- a/data/scripts/script_08012B24.inc +++ b/data/scripts/script_08012B24.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012B24 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0004 EndBlock DoPostScriptAction 0x0001 diff --git a/data/scripts/script_08012B50.inc b/data/scripts/script_08012B50.inc index 8e0045ae..13cd72a9 100644 --- a/data/scripts/script_08012B50.inc +++ b/data/scripts/script_08012B50.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012B50 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0000 EndBlock DoPostScriptAction 0x0001 diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/script_08012B7C.inc index a013bbf7..015962e2 100644 --- a/data/scripts/script_08012B7C.inc +++ b/data/scripts/script_08012B7C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012B7C BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EB44 0x0002 EndBlock DoPostScriptAction 0x0001 diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc index 4c7cd730..7d27437b 100644 --- a/data/scripts/script_08012C48.inc +++ b/data/scripts/script_08012C48.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012C48 BeginBlock DoPostScriptAction 0x0007 - SetEntityNonPlanarMovement 0x0280 + SetEntitySpeed 0x0280 EndBlock _0807EDD4 0x0388, 0x0168 _0807E5F8 0x00000100 diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/script_08012DB0.inc index d0888079..09eef4e2 100644 --- a/data/scripts/script_08012DB0.inc +++ b/data/scripts/script_08012DB0.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012DB0 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0088, 0x0068 _0807EB44 0x0000 diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc index 760a0faf..21ed79e5 100644 --- a/data/scripts/script_08012DF8.inc +++ b/data/scripts/script_08012DF8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012DF8 BeginBlock _0807EB44 0x0000 - SetEntityNonPlanarMovement 0x0140 + SetEntitySpeed 0x0140 EndBlock _0807EDD4 0x00b8, 0x0094 Wait 0x0008 diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc index b58b20ab..4d929371 100644 --- a/data/scripts/script_08012E44.inc +++ b/data/scripts/script_08012E44.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012E44 BeginBlock - SetEntityNonPlanarMovement 0x0140 + SetEntitySpeed 0x0140 EndBlock Wait 0x003c _0807EB44 0x0004 diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc index 713ffc5d..154a90ed 100644 --- a/data/scripts/script_080130E4.inc +++ b/data/scripts/script_080130E4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080130E4 BeginBlock _0807EB44 0x0006 - SetEntityNonPlanarMovement 0x0140 + SetEntitySpeed 0x0140 EndBlock _0807EDD4 0x00a8, 0x0060 Wait 0x0008 diff --git a/data/scripts/script_080132E4.inc b/data/scripts/script_080132E4.inc index 752b9606..61f3f5ea 100644 --- a/data/scripts/script_080132E4.inc +++ b/data/scripts/script_080132E4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080132E4 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0058 diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc index 0463b892..7963871e 100644 --- a/data/scripts/script_0801330C.inc +++ b/data/scripts/script_0801330C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0801330C BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 _0807EC64 0x0020 diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc index c69a56b2..d210e38e 100644 --- a/data/scripts/script_0801334C.inc +++ b/data/scripts/script_0801334C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0801334C BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x000d EndBlock DoPostScriptAction 0x0001 diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc index 12714774..d0722887 100644 --- a/data/scripts/script_08013494.inc +++ b/data/scripts/script_08013494.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08013494 BeginBlock _0807E930 0x0000 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 EndBlock diff --git a/data/scripts/script_080136B4.inc b/data/scripts/script_080136B4.inc index 4e10b00a..da761630 100644 --- a/data/scripts/script_080136B4.inc +++ b/data/scripts/script_080136B4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080136B4 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00e8, 0x00a8 _0807EB44 0x0000 diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc index 662b5c12..989c33ee 100644 --- a/data/scripts/script_080136D8.inc +++ b/data/scripts/script_080136D8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080136D8 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock Call sub_0807F584 JumpTable script_080136F0, script_080136FA, script_08013704, script_080136FA diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc index f956f230..bc6bb9c4 100644 --- a/data/scripts/script_08013E04.inc +++ b/data/scripts/script_08013E04.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08013E04 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x00f8 _0807E930 0x0001 _0807E5F8 0x08000000 diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc index 8f80fedd..ebdbe6ce 100644 --- a/data/scripts/script_08013E28.inc +++ b/data/scripts/script_08013E28.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08013E28 DoPostScriptAction 0x0007 _0807E930 0x0002 EndBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x00f8 _0807E930 0x0003 _0807E5F8 0x10000000 diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc index 0e0bfde8..4cf5047d 100644 --- a/data/scripts/script_08013E4C.inc +++ b/data/scripts/script_08013E4C.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08013E4C DoPostScriptAction 0x0007 _0807E930 0x0004 EndBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x0168 _0807E930 0x0005 _0807E5F8 0x20000000 diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc index ef89297d..f74c3644 100644 --- a/data/scripts/script_08013E70.inc +++ b/data/scripts/script_08013E70.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08013E70 DoPostScriptAction 0x0007 _0807E930 0x0006 EndBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x0168 _0807E930 0x0007 _0807E5F8 0x40000000 diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index e0eaae33..ad470edd 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08014450 BeginBlock _0807E9D4 _0807EB44 0x0000 - SetEntityNonPlanarMovement 0x01c0 + SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a EndBlock script_08014462: diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc index 6ac1a03a..9965924d 100644 --- a/data/scripts/script_0801450C.inc +++ b/data/scripts/script_0801450C.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0801450C BeginBlock _0807E9D4 _0807EB44 0x0000 - SetEntityNonPlanarMovement 0x01c0 + SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a EndBlock _0807E864 diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc index 0d0ed719..35e475e0 100644 --- a/data/scripts/script_08014588.inc +++ b/data/scripts/script_08014588.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08014588 EndBlock WaitForSomething2 0x00000001 - SetEntityNonPlanarMovement 0x00e0 + SetEntitySpeed 0x00e0 _0807EDD4 0x0078, 0x0078 DoPostScriptAction 0x0000 Wait 0x0010 diff --git a/data/scripts/script_080147DC.inc b/data/scripts/script_080147DC.inc index da36490e..c6e83402 100644 --- a/data/scripts/script_080147DC.inc +++ b/data/scripts/script_080147DC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080147DC EndBlock WaitForSomething2 0x00000002 - SetEntityNonPlanarMovement 0x00e0 + SetEntitySpeed 0x00e0 _0807EDD4 0x0078, 0x0068 DoPostScriptAction 0x0000 Wait 0x0010 diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc index 268787d0..46812d26 100644 --- a/data/scripts/script_080149CC.inc +++ b/data/scripts/script_080149CC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080149CC BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 Call sub_0806C870 DoPostScriptAction 0x000a EndBlock diff --git a/data/scripts/script_08014B10.inc b/data/scripts/script_08014B10.inc index c06b6709..45c292eb 100644 --- a/data/scripts/script_08014B10.inc +++ b/data/scripts/script_08014B10.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08014B10 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0078, 0x0040 _0807EB44 0x0000 diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index d0bbc238..4cb6b657 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08014CDC BeginBlock - SetEntityNonPlanarMovement 0x0180 + SetEntitySpeed 0x0180 DoPostScriptAction 0x000a Call sub_08066D04 Call sub_08066D14 diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc index ab814f8e..600e376d 100644 --- a/data/scripts/script_08015234.inc +++ b/data/scripts/script_08015234.inc @@ -21,7 +21,7 @@ SCRIPT_START script_08015234 WaitForSomething2 0x00000002 SoundReq 0x00f5 DoPostScriptAction 0x001f - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 _0807ECC4 0x0030 diff --git a/data/scripts/script_080152B4.inc b/data/scripts/script_080152B4.inc index 6d1d581b..e29fae3e 100644 --- a/data/scripts/script_080152B4.inc +++ b/data/scripts/script_080152B4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080152B4 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00b8 diff --git a/data/scripts/script_080152DC.inc b/data/scripts/script_080152DC.inc index 773a9c35..c16d1795 100644 --- a/data/scripts/script_080152DC.inc +++ b/data/scripts/script_080152DC.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080152DC BeginBlock - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 diff --git a/data/scripts/script_08015338.inc b/data/scripts/script_08015338.inc index 722f838a..786e3cf2 100644 --- a/data/scripts/script_08015338.inc +++ b/data/scripts/script_08015338.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08015338 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 diff --git a/data/scripts/script_08015360.inc b/data/scripts/script_08015360.inc index 5e999a0e..73b67bde 100644 --- a/data/scripts/script_08015360.inc +++ b/data/scripts/script_08015360.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08015360 BeginBlock - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 SetEntityPositionRelative 0x0208, 0x0148 EndBlock _0807EB44 0x0006 diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index 054a574f..6f8a7d4f 100644 --- a/data/scripts/script_08015390.inc +++ b/data/scripts/script_08015390.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08015390 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 EndBlock _0807E930 0x001f diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index 9ec275ae..60940bdc 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0801550C BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 _0807EB44 0x0000 Call sub_0807F338 diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc index 47e1488a..399b1b33 100644 --- a/data/scripts/script_08015618.inc +++ b/data/scripts/script_08015618.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015618 BeginBlock DoPostScriptAction 0x0007 - SetEntityNonPlanarMovement 0x0040 + SetEntitySpeed 0x0040 Call sub_08094B80 EndBlock WaitForSomething2 0x00000080 diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc index f63f2e84..4dbe2747 100644 --- a/data/scripts/script_08015754.inc +++ b/data/scripts/script_08015754.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015754 BeginBlock _0807E930 0x0000 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 Call sub_08094B80 EndBlock Wait 0x0078 @@ -11,7 +11,7 @@ SCRIPT_START script_08015754 SoundReq 0x01c6 Call sub_08094B80 _0807E5F8 0x00020000 - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 WaitForSomething2 0x00040000 _0807EDD4 0x0078, 0x00c8 _0807E5F8 0x00080000 diff --git a/data/scripts/script_080158F8.inc b/data/scripts/script_080158F8.inc index cd1e1208..0c4d7f69 100644 --- a/data/scripts/script_080158F8.inc +++ b/data/scripts/script_080158F8.inc @@ -1,5 +1,5 @@ SCRIPT_START script_080158F8 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0218, 0x0238 _0807EB44 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08015918.inc b/data/scripts/script_08015918.inc index 355718a5..2c49a5c5 100644 --- a/data/scripts/script_08015918.inc +++ b/data/scripts/script_08015918.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08015918 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0238, 0x0228 _0807EB44 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08015938.inc b/data/scripts/script_08015938.inc index 17f2e6a2..df0c766b 100644 --- a/data/scripts/script_08015938.inc +++ b/data/scripts/script_08015938.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08015938 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0248, 0x0208 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index 5bf2e8fa..362d76c9 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08015958 BeginBlock - SetEntityNonPlanarMovement 0x0180 + SetEntitySpeed 0x0180 DoPostScriptAction 0x0008 DoPostScriptAction 0x000b Call sub_08066D04 @@ -29,7 +29,7 @@ SCRIPT_START script_08015958 WaitForSomething2 0x00000001 Call sub_0807F3C8 SoundReq 0x0096 - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 _0807ECC4 0x0008 _0807E930 0x0040 Call sub_0807F2D4 @@ -41,7 +41,7 @@ SCRIPT_START script_08015958 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0238, 0x0238 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08015A7C.inc b/data/scripts/script_08015A7C.inc index a5c8b58e..ade0dcff 100644 --- a/data/scripts/script_08015A7C.inc +++ b/data/scripts/script_08015A7C.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08015A7C - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EC64 0x0010 _0807EB44 0x0000 diff --git a/data/scripts/script_08015AA0.inc b/data/scripts/script_08015AA0.inc index d009852f..24b46093 100644 --- a/data/scripts/script_08015AA0.inc +++ b/data/scripts/script_08015AA0.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08015AA0 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EC94 0x0010 _0807EB44 0x0002 diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc index 859115b3..fced2034 100644 --- a/data/scripts/script_08015B14.inc +++ b/data/scripts/script_08015B14.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015B14 BeginBlock _0807E930 0x0018 - SetEntityNonPlanarMovement 0x0300 + SetEntitySpeed 0x0300 EndBlock _0807EDD4 0x0248, 0x0218 _0807E5F8 0x00000020 diff --git a/data/scripts/script_08015B84.inc b/data/scripts/script_08015B84.inc index b20e3589..afe2682a 100644 --- a/data/scripts/script_08015B84.inc +++ b/data/scripts/script_08015B84.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08015B84 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EC64 0x0010 _0807EB44 0x0000 diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc index f5c9fcc5..0798902d 100644 --- a/data/scripts/script_08015BA8.inc +++ b/data/scripts/script_08015BA8.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08015BA8 _0807E864 MoveEntityToPlayer CameraTargetEntity - SetEntityNonPlanarMovement 0x0200 + SetEntitySpeed 0x0200 EndBlock Wait 0x000f _0807E8E4_2 diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc index 82ec46eb..afbdefbc 100644 --- a/data/scripts/script_08015BE8.inc +++ b/data/scripts/script_08015BE8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08015BE8 BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock script_08015BF0: CheckPlayerInRegion 0x0160, 0x0020, 0x3040 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index ac412e51..966109fa 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08015C7C BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0168, 0x0058 diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc index 171e7ea6..6cb4e64b 100644 --- a/data/scripts/script_08015F3C.inc +++ b/data/scripts/script_08015F3C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08015F3C BeginBlock - SetEntityNonPlanarMovement 0x0080 + SetEntitySpeed 0x0080 _0807EB44 0x0000 _0807E930 0x0000 EndBlock diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc index fd4ca990..91553bd0 100644 --- a/data/scripts/script_08016030.inc +++ b/data/scripts/script_08016030.inc @@ -6,7 +6,7 @@ SCRIPT_START script_08016030 WaitForSomething2 0x00000001 DoPostScriptAction 0x0010 Wait 0x003c - SetEntityNonPlanarMovement 0x0020 + SetEntitySpeed 0x0020 _0807ECF4 0x0080 Wait 0x001e DoPostScriptAction 0x0010 diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc index 1966d5cf..b700d7ba 100644 --- a/data/scripts/script_0801606C.inc +++ b/data/scripts/script_0801606C.inc @@ -6,7 +6,7 @@ SCRIPT_START script_0801606C WaitForSomething2 0x00000002 DoPostScriptAction 0x0010 Wait 0x003c - SetEntityNonPlanarMovement 0x0020 + SetEntitySpeed 0x0020 _0807EC94 0x0080 Wait 0x001e DoPostScriptAction 0x0010 diff --git a/data/scripts/script_0801635C.inc b/data/scripts/script_0801635C.inc index 12ddcd91..002227b9 100644 --- a/data/scripts/script_0801635C.inc +++ b/data/scripts/script_0801635C.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0801635C - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 _0807EDD4 0x0078, 0x0050 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index 5999bc0c..b55e1150 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -42,7 +42,7 @@ SCRIPT_START script_08016482 _0807EB8C SetEntityDirection 0x0000 SetEntityDirectionWithAnimationState 0x0000 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 SetEntity0x20 0x00018000 SetEntityPositionRelative 0x0000, 0x0000 MoveEntityToPlayer diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index cc22a1f0..8577e4f6 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -38,7 +38,7 @@ script_0801662E: _0807E878 Jump script_0801662E .2byte 0x0000 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 script_08016648: _0807ECF4 0x0030 Wait 0x0008 @@ -63,7 +63,7 @@ script_0801666C: _0807ED24 0x00d8, 0x003f, 0x003c Wait 0x0008 Jump script_0801666C - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 script_080166BC: _0807EDD4 0x0055, 0x0039 Wait 0x0008 @@ -78,7 +78,7 @@ script_080166BC: _0807EDD4 0x00d8, 0x003f Wait 0x0008 Jump script_080166BC - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 script_08016700: _0807EC94 0x0030 _0807E5F8 0x00000002 @@ -115,7 +115,7 @@ script_08016700: _0807EB44 0x0004 Wait 0x003c Jump script_08016700 - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 script_0801679C: WaitForSomething 0x00000002 _0807E610 0x00000002 @@ -154,7 +154,7 @@ script_0801679C: Wait 0x0002 _0807EB44 0x0004 Jump script_0801679C - SetEntityNonPlanarMovement 0x0100 + SetEntitySpeed 0x0100 script_08016848: WaitForSomething 0x00000004 _0807E610 0x00000004 |