diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index 9d40b8d1..f9206713 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -547,9 +547,9 @@ .2byte \direction .endm -.macro SetEntityNonPlanarMovement nonPlanarMovement:req +.macro SetEntitySpeed speed:req .2byte 0x0867 - .2byte \nonPlanarMovement + .2byte \speed .endm .macro SetEntity0x20 value:req 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 diff --git a/include/entity.h b/include/entity.h index a1dd6d93..f3a76a68 100644 --- a/include/entity.h +++ b/include/entity.h @@ -92,7 +92,7 @@ typedef struct Entity { /*0x1e*/ u8 frameIndex; /*0x1f*/ u8 lastFrameIndex; /*0x20*/ s32 field_0x20; - /*0x24*/ s16 nonPlanarMovement; + /*0x24*/ s16 speed; /*0x26*/ u8 spriteAnimation[3]; /*0x29*/ struct { /* */ u8 b0 : 3; // 1-4 diff --git a/src/code_0805436C.c b/src/code_0805436C.c index 76a9b18c..be879f99 100644 --- a/src/code_0805436C.c +++ b/src/code_0805436C.c @@ -255,7 +255,7 @@ u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter) { arg0->attachedEntity = itemEntity; } else if (arg0->id == 0x1e) { itemEntity->direction = arg0->animationState << 3 | 0x80; - itemEntity->nonPlanarMovement = 0xc0; + itemEntity->speed = 0xc0; itemEntity->field_0x20 = 0x18000; } } diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c index 3344b5b5..2825aed5 100644 --- a/src/enemy/acroBandits.c +++ b/src/enemy/acroBandits.c @@ -452,7 +452,7 @@ void sub_08032160(Entity* this) { } else { this->spriteSettings.b.flipX = 0; } - this->nonPlanarMovement = 0xf0; + this->speed = 0xf0; this->field_0x20 = 0x12000; this->spritePriority.b1 = 1; InitializeAnimation(this, 12); diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index 61e54b6a..5ba78755 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -102,7 +102,7 @@ void sub_080218CC(Entity* this) { this->previousActionFlag = 1; this->spriteSettings.b.draw = 1; this->direction = ((sub_08049F84(this, 1) ^ 0x10) + gUnk_080CB5DC[Random() & 7]) & 0x1f; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; this->field_0x20 = 0x12000; } @@ -118,7 +118,7 @@ void sub_080218CC(Entity* this) { this->actionDelay = (Random() & 0x38) + 8; this->field_0xf = 1; this->flags |= 0x80; - this->nonPlanarMovement = 0x180; + this->speed = 0x180; InitializeAnimation(this, 0); } } @@ -139,7 +139,7 @@ void sub_08021984(Entity* this) { this->actionDelay = 16; this->field_0xf = 1; this->spriteSettings.b.draw = 1; - this->nonPlanarMovement = 0x180; + this->speed = 0x180; ((u8*)&this->field_0x86)[0] = 60; InitializeAnimation(this, 0); UpdateSpriteForCollisionLayer(this); @@ -309,9 +309,9 @@ void sub_08021D44(Entity* this, u32 direction) { direction = DirectionRoundUp(direction); this->direction = direction; if (DirectionIsHorizontal(direction)) { - this->nonPlanarMovement = 0x180; + this->speed = 0x180; } else { - this->nonPlanarMovement = 0xc0; + this->speed = 0xc0; } } diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c index bf4b4372..d9c1a2a8 100644 --- a/src/enemy/bobomb.c +++ b/src/enemy/bobomb.c @@ -53,7 +53,7 @@ void sub_0802C688(Entity* this) { this->damageType = 0x6e; this->field_0xf = 1; this->field_0x20 = 0x18000; - this->nonPlanarMovement = 0; + this->speed = 0; this->field_0x80.HALF.HI = 1; InitializeAnimation(this, this->direction >> 4 | 6); break; @@ -68,7 +68,7 @@ void sub_0802C7AC(Entity* this) { this->field_0xf = 1; this->height.HALF.HI = 0; if (this->field_0x82.HALF.LO != 2) { - this->nonPlanarMovement = this->field_0x82.HALF.LO ? 0x200 : 0x80; + this->speed = this->field_0x82.HALF.LO ? 0x200 : 0x80; } this->field_0x20 = 0x18000; this->field_0x82.HALF.HI = 0; @@ -224,7 +224,7 @@ void sub_0802CA94(Entity* this) { this->field_0xf = 1; this->spritePriority.b1 = 1; this->field_0x20 = 0x18000; - this->nonPlanarMovement = 0; + this->speed = 0; this->field_0x82.HALF.HI = 0; this->field_0x80.HALF.HI = 0; this->direction = ((gPlayerEntity.animationState << 2) | 4) & 0x1c; @@ -261,11 +261,11 @@ void sub_0802CB68(Entity* this) { this->flags |= 0x80; if (this->field_0x82.HALF.LO) { this->actionDelay = 200; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; InitializeAnimation(this, (this->direction >> 4) | 2); } else { this->actionDelay = 0x3c; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; InitializeAnimation(this, this->direction >> 4); } } diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index b8dc9575..228855be 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -174,7 +174,7 @@ void sub_0802AA40(Entity* this) { } if (this->direction == direction) { this->action = 3; - this->nonPlanarMovement = 0x180; + this->speed = 0x180; this->field_0x7a.HALF.HI = 0; ent->field_0x80.HALF.LO = 1; ent->actionDelay = 0x96; @@ -244,7 +244,7 @@ void sub_0802AB40(Entity* this) { } } else { this->action = 5; - this->nonPlanarMovement = 0; + this->speed = 0; InitializeAnimation(this, this->type + 1); } break; @@ -256,7 +256,7 @@ void sub_0802AC08(Entity* this) { this->action = 2; this->previousActionFlag = 0; this->actionDelay = 0x40; - this->nonPlanarMovement = 0xc0; + this->speed = 0xc0; sub_0802ACDC(this, 8); sub_0802ADDC(this); } diff --git a/src/enemy/chaser.c b/src/enemy/chaser.c index 00d99937..7e0ac960 100644 --- a/src/enemy/chaser.c +++ b/src/enemy/chaser.c @@ -36,7 +36,7 @@ void sub_0802B540(Entity* this) { u32 direction = sub_0804A024(this, 1, 0xc); if (direction != 0xff) { this->action = 2; - this->nonPlanarMovement = 0x40; + this->speed = 0x40; this->direction = direction; } } @@ -45,15 +45,15 @@ void sub_0802B540(Entity* this) { void sub_0802B56C(Entity* this) { GetNextFrame(this); if (this->bitfield & 0x80) { - this->nonPlanarMovement = 0x40; + this->speed = 0x40; } if (sub_080AF038(this)) { if (this->animIndex != 1) { InitializeAnimation(this, 1); } - if (this->nonPlanarMovement < 0x220) { - this->nonPlanarMovement += 4; + if (this->speed < 0x220) { + this->speed += 4; } } else { this->action = 3; diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index 99a9160a..e8ee87d3 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -54,7 +54,7 @@ void Chuchu(Entity* this) { if (this->flags & 0x80) { this->action = 6; this->flags &= ~0x80; - this->nonPlanarMovement = 0x20; + this->speed = 0x20; this->damageType = 0x5c; InitializeAnimation(this, 5); } @@ -293,7 +293,7 @@ void sub_0801F328(Entity* this) { void sub_0801F340(Entity* this) { this->action = 5; this->actionDelay = 60; - this->nonPlanarMovement = 0x20; + this->speed = 0x20; this->damageType = 92; InitializeAnimation(this, 2); } @@ -417,7 +417,7 @@ void sub_0801F584(Entity* this) { } else { this->action = 6; this->field_0xf = 60; - this->nonPlanarMovement = 0x20; + this->speed = 0x20; this->damageType = 92; InitializeAnimation(this, 2); } @@ -469,7 +469,7 @@ void sub_0801F6F8(Entity* this) { GetNextFrame(this); if (this->frames.all & 0x80) { this->action = 4; - this->nonPlanarMovement = 0x20; + this->speed = 0x20; sub_0804AA1C(this); InitializeAnimation(this, 2); } @@ -592,7 +592,7 @@ void sub_0801F940(Entity* this) { } else { this->action = 6; this->field_0xf = 60; - this->nonPlanarMovement = 0x20; + this->speed = 0x20; InitializeAnimation(this, 2); } } @@ -644,7 +644,7 @@ void sub_0801FAAC(Entity* this) { GetNextFrame(this); if (this->frames.all & 0x80) { sub_0801FB14(this); - this->nonPlanarMovement = 0x20; + this->speed = 0x20; sub_0804AA1C(this); } } @@ -705,7 +705,7 @@ u32 sub_0801FBD0(Entity* this) { } void Chuchu_JumpAtPlayer(Entity* this) { - this->nonPlanarMovement = 0x180; + this->speed = 0x180; this->field_0x20 = 0x20000; this->direction = sub_08049F84(this, 1); InitializeAnimation(this, 3); diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c index de87165a..e0f7a8f0 100644 --- a/src/enemy/cuccoChickAggr.c +++ b/src/enemy/cuccoChickAggr.c @@ -71,7 +71,7 @@ void sub_080229F8(Entity* this) { this->actionDelay = 6; this->field_0xf = 8; this->frameIndex = 0; - this->nonPlanarMovement = 0xc0; + this->speed = 0xc0; sub_08022B44(this); } else { this->field_0x20 = 0x10000; @@ -110,7 +110,7 @@ void sub_08022AA4(Entity* this) { this->action = 2; this->actionDelay = (rand & 3) + 1; this->field_0xf = 1; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; if (!sub_08049FA0(this) && (rand >> 8) & 3) { this->direction = sub_08049EE4(this); diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c index 49acb71d..83fa7296 100644 --- a/src/enemy/darkNut.c +++ b/src/enemy/darkNut.c @@ -428,7 +428,7 @@ void sub_08021328(Entity* this) { void sub_0802134C(Entity* this) { this->action = 15; this->direction = DirectionFromAnimationState(this->animationState); - this->nonPlanarMovement = 0x200; + this->speed = 0x200; this->field_0x76.HWORD = 0x78; sub_08021218(this, 0xe, this->animationState); } @@ -445,7 +445,7 @@ void sub_08021380(Entity* this) { void sub_08021390(Entity* this) { this->action = 7; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; this->damageType = 0x56; sub_08021218(this, 6, this->animationState); } @@ -453,7 +453,7 @@ void sub_08021390(Entity* this) { void sub_080213B0(Entity* this) { this->action = 3; this->actionDelay = 1; - this->nonPlanarMovement = 0xc0; + this->speed = 0xc0; this->field_0x76.HWORD = 0xf0; sub_08021218(this, 3, this->animationState); } @@ -472,7 +472,7 @@ void sub_080213F0(Entity* this) { void sub_08021400(Entity* this) { this->action = 9; - this->nonPlanarMovement = 0x60; + this->speed = 0x60; sub_08021218(this, 10, this->animationState); } diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c index 4b469258..798f4939 100644 --- a/src/enemy/fallingBoulder.c +++ b/src/enemy/fallingBoulder.c @@ -156,15 +156,15 @@ void sub_0802C4B0(Entity* this) { rand = Random() & 7; if (rand & 4) { if (rand & 3) { - this->nonPlanarMovement = gUnk_080CD568[offset | 2]; + this->speed = gUnk_080CD568[offset | 2]; } else { - this->nonPlanarMovement = gUnk_080CD568[offset | 0]; + this->speed = gUnk_080CD568[offset | 0]; } } else { if (rand & 3) { - this->nonPlanarMovement = gUnk_080CD568[offset | 1]; + this->speed = gUnk_080CD568[offset | 1]; } else { - this->nonPlanarMovement = gUnk_080CD568[offset | 3]; + this->speed = gUnk_080CD568[offset | 3]; } } diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c index 3a4e4148..e2d8914d 100644 --- a/src/enemy/fireballGuy.c +++ b/src/enemy/fireballGuy.c @@ -39,7 +39,7 @@ void sub_080453E8(Entity* this) { this->action = 1; this->actionDelay = 0; this->spriteSettings.b.draw = 1; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->cutsceneBeh.HALF.LO = this->currentHealth; this->field_0x3c |= 0x10; sub_0804A720(this); diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c index a1a9833d..f3228707 100644 --- a/src/enemy/gibdo.c +++ b/src/enemy/gibdo.c @@ -211,7 +211,7 @@ void sub_080377B0(Entity* this) { this->field_0xf = 8; r1 = Random(); this->field_0x74.HWORD = (r1 & 0x38) + 0x78; - this->nonPlanarMovement = 0x40; + this->speed = 0x40; r2 = Random(); if (!sub_08049FA0(this) && (r2 & 3)) { this->direction = DirectionRoundUp(sub_08049EE4(this)); @@ -233,7 +233,7 @@ NONMATCH("asm/non_matching/gibdo/sub_08037810.inc", u32 sub_08037810(Entity* thi this->action = 3; this->actionDelay = 0x18; this->field_0xf = 0x8; - this->nonPlanarMovement = 0xc0; + this->speed = 0xc0; y = DirectionRoundUp(GetFacingDirection(this, gUnk_020000B0)); this->direction = y; this->animationState = y / 8; @@ -258,7 +258,7 @@ u32 sub_080378B0(Entity* this) { if (sub_0804A044(this, gUnk_020000B0, 0xa) == this->direction) if (sub_0806FCB8(this, gUnk_020000B0->x.HALF.HI, gUnk_020000B0->y.HALF.HI, 0x18) != 0) { this->action = 5; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; InitAnimationForceUpdate(this, this->animationState + 8); return 1; } diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c index 330e68b8..1edbf4f9 100644 --- a/src/enemy/gyorgMale.c +++ b/src/enemy/gyorgMale.c @@ -144,7 +144,7 @@ void sub_08046930(Entity* this) { if (this->type) { this->previousActionFlag = 5; this->direction = 0x20; - this->nonPlanarMovement = 0x280; + this->speed = 0x280; } sub_08047D88(this); if (this->field_0x7c.BYTES.byte0 == 0) @@ -153,7 +153,7 @@ void sub_08046930(Entity* this) { this->actionDelay = 1; this->animationState = 0; this->direction = 0; - this->nonPlanarMovement = 0x280; + this->speed = 0x280; } void sub_0804696C(Entity* this) { @@ -161,7 +161,7 @@ void sub_0804696C(Entity* this) { if (gRoomControls.roomOriginY + 0x130 > this->y.HALF.HI) { this->previousActionFlag = 2; this->direction = 0x80; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; this->spriteOrientation.flipY = 3; this->spriteRendering.b3 = 3; SoundReq(0x2e); @@ -232,7 +232,7 @@ void sub_08046A9C(Entity* this) { void sub_08046AE8(Entity* this) { this->previousActionFlag = 1; - this->nonPlanarMovement = 0x180; + this->speed = 0x180; sub_08048178(this, ((Entity*)this->myHeap)->next->animationState >> 5); this->field_0x76.HWORD = this->direction << 8; sub_08047D88(this); @@ -310,7 +310,7 @@ void sub_08046CEC(Entity* this) { if (((Entity*)this->myHeap)->prev->field_0x6c.HWORD & 2) { this->action = 2; this->previousActionFlag = 0; - this->animationState = this->nonPlanarMovement; + this->animationState = this->speed; } } @@ -319,7 +319,7 @@ const u16 gUnk_080D1B60[8] = { 0x200, 0x184, 0x28C, 0x210, 0x200, 0x29C, 0x174, void sub_08046D44(Entity* this) { const u16* tmp; this->previousActionFlag = 1; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; tmp = gUnk_080D1B60 + (((Entity*)this->myHeap)->next->animationState >> 5); this->field_0x80.HWORD = tmp[0] + gRoomControls.roomOriginX; this->field_0x82.HWORD = tmp[1] + gRoomControls.roomOriginY; @@ -385,7 +385,7 @@ void sub_08046EF4(Entity* this) { this->actionDelay = 0x7F; this->direction ^= 0x80; } - this->nonPlanarMovement = gUnk_080D1B74[(this->actionDelay >> 3) & 0xF]; + this->speed = gUnk_080D1B74[(this->actionDelay >> 3) & 0xF]; if ((--this->field_0xf & 0xFF) == 0) { Entity* tmp; this->field_0xf = (Random() & 0x38) + 0x78; @@ -428,7 +428,7 @@ void sub_08046F64(Entity* this) { void sub_08046FE8(Entity* this) { this->previousActionFlag = 1; - this->nonPlanarMovement = 0x1c0; + this->speed = 0x1c0; this->field_0x7c.HALF.HI = 0x1e; this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x290; this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x190; @@ -445,10 +445,10 @@ void sub_0804702C(Entity* this) { } } sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8); - if (sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, (this->nonPlanarMovement >> 0x10) + 0x10)) { + if (sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, (this->speed >> 0x10) + 0x10)) { this->previousActionFlag = 2; this->field_0x76.HWORD = this->direction << 8; - this->nonPlanarMovement = 0x280; + this->speed = 0x280; } } @@ -467,7 +467,7 @@ void sub_080470B4(Entity* this) { sub_08047EA4(this, ((0x100 - this->direction) & 0xFF) << 8); } else { this->previousActionFlag = 3; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; this->field_0x76.HWORD = this->direction << 8; this->field_0x74.HWORD = gUnk_080D1BBC[Random() & 1]; sub_08047D88(this); @@ -485,8 +485,8 @@ void sub_08047140(Entity* this) { } void sub_0804717C(Entity* this) { - if (this->nonPlanarMovement < 0x280) { - this->nonPlanarMovement += 8; + if (this->speed < 0x280) { + this->speed += 8; } sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8); if (gRoomControls.roomOriginX + 0x200 > this->x.HALF.HI) { @@ -495,8 +495,8 @@ void sub_0804717C(Entity* this) { } void sub_080471C8(Entity* this) { - if (this->nonPlanarMovement > 0x180) { - this->nonPlanarMovement -= 0x10; + if (this->speed > 0x180) { + this->speed -= 0x10; } if (this->direction < 0xe0) { this->direction++; @@ -519,7 +519,7 @@ void sub_0804723C(Entity* this) { this->direction -= 2; if (this->direction < 0xc0) { this->previousActionFlag = 7; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; this->direction = 0xc0; this->field_0x76.HWORD = 0xc000; } @@ -538,8 +538,8 @@ void sub_08047284(Entity* this) { } void sub_080472BC(Entity* this) { - if (this->nonPlanarMovement < 0x300) { - this->nonPlanarMovement += 8; + if (this->speed < 0x300) { + this->speed += 8; } sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8); if (gRoomControls.roomOriginX + 0x2B0 >= this->x.HALF.HI) @@ -549,8 +549,8 @@ void sub_080472BC(Entity* this) { } void sub_08047310(Entity* this) { - if (this->nonPlanarMovement < 0x180) { - this->nonPlanarMovement -= 0x10; + if (this->speed < 0x180) { + this->speed -= 0x10; } this->field_0x76.HWORD -= 0x1D0; this->direction = this->field_0x76.HWORD >> 8; @@ -580,7 +580,7 @@ void sub_0804736C(Entity* this) { void sub_080473B8(Entity* this) { this->previousActionFlag = 1; - this->nonPlanarMovement = 0x120; + this->speed = 0x120; this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x200; this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x1D0; sub_08047D88(this); @@ -608,7 +608,7 @@ void sub_080473F0(Entity* this) { if (sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, 8)) { this->previousActionFlag = 2; this->field_0x76.HWORD = this->direction << 8; - this->nonPlanarMovement = 0x180; + this->speed = 0x180; } } @@ -625,7 +625,7 @@ void sub_08047484(Entity* this) { sub_08047EA4(this, ((0x100 - this->direction) & 0xFF) << 8); } else { this->previousActionFlag = 3; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; this->direction = 0x40; this->field_0x76.HWORD = 0x4000; this->field_0x74.HWORD = 0x180; @@ -665,7 +665,7 @@ void sub_08047508(Entity* this) { sub_08047E48(this); if (gRoomControls.roomOriginX + 0x280 < this->x.HALF.HI) { this->previousActionFlag = 4; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; this->animationState = this->direction; this->field_0x76.HWORD = this->direction << 8; } @@ -683,7 +683,7 @@ void sub_080475F4(Entity* this) { if (this->direction >= 0xc0) { this->direction = 0xc0; this->previousActionFlag = 5; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; this->field_0x7c.HALF.HI = 0x3c; } sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8); @@ -720,7 +720,7 @@ void sub_0804763C(Entity* this) { sub_08047E48(this); if (gRoomControls.roomOriginX + 0x180 > this->x.HALF.HI) { this->previousActionFlag = 6; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; this->animationState = this->direction; this->field_0x76.HWORD = this->direction << 8; } @@ -738,7 +738,7 @@ void sub_0804772C(Entity* this) { if (this->direction <= 0x40) { this->direction = 0x40; this->previousActionFlag = 3; - this->nonPlanarMovement = 0x200; + this->speed = 0x200; this->field_0x7c.HALF.HI = 0x1e; } sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8); @@ -753,7 +753,7 @@ void sub_08047778(Entity* this) { void sub_08047798(Entity* this) { this->previousActionFlag = 1; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; if (this->x.HALF.HI - gRoomControls.roomOriginX < 0x1F8) { this->field_0x80.HWORD = 0xa8; } else { @@ -767,8 +767,8 @@ void sub_08047798(Entity* this) { const s16 gUnk_080D1BF0[2] = { 0x80, -0x80 }; void sub_080477F0(Entity* this) { - if (this->nonPlanarMovement < 0x300) { - this->nonPlanarMovement += 8; + if (this->speed < 0x300) { + this->speed += 8; } this->direction = sub_080045DA(this->field_0x80.HWORD - this->x.HALF.HI, this->field_0x82.HWORD - this->y.HALF.HI); sub_08047E48(this); @@ -876,7 +876,7 @@ void sub_08047978(Entity* this) { void sub_08047B08(Entity* this) { sub_08047D88(this); this->direction = sub_080045DA(this->field_0x80.HWORD - this->x.HALF.HI, this->field_0x82.HWORD - this->y.HALF.HI); - this->nonPlanarMovement = 0x200; + this->speed = 0x200; sub_08047E58(this); if (!sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, 4)) return; @@ -918,7 +918,7 @@ const s8 gUnk_080D1C00[4] = { 0x40, -0x40, -0x40, 0x40 }; void sub_08047BF0(Entity* this) { Entity* tmp; this->direction = gUnk_080D1C00[this->actionDelay & 3]; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; sub_08047E48(this); if (this->actionDelay == 0) { if ((this->field_0xf++ & 0xF) == 0) { @@ -934,7 +934,7 @@ void sub_08047BF0(Entity* this) { } } this->direction = this->field_0x76.HWORD; - this->nonPlanarMovement = 0x140; + this->speed = 0x140; sub_08047E48(this); if (this->y.HALF.HI > gRoomControls.roomOriginY + 0x270) { this->previousActionFlag = 2; @@ -1009,7 +1009,7 @@ void sub_08047DF0(Entity* this, u32 unk1) { sub_08047EA4(this, unk1); oldX = this->x.HALF.HI; oldY = this->y.HALF.HI; - sub_0806F62C(this, this->nonPlanarMovement, this->direction); + sub_0806F62C(this, this->speed, this->direction); if (this->field_0x7c.BYTES.byte0 & 1) { if (sub_08079F8C()) { gPlayerEntity.x.HALF.HI += this->x.HALF.HI - oldX; @@ -1027,7 +1027,7 @@ void sub_08047E58(Entity* this) { u32 oldX, oldY; oldX = this->x.HALF.HI; oldY = this->y.HALF.HI; - sub_0806F62C(this, this->nonPlanarMovement, this->direction); + sub_0806F62C(this, this->speed, this->direction); if (this->field_0x7c.BYTES.byte0 & 1) { if (sub_08079F8C()) { gPlayerEntity.x.HALF.HI += this->x.HALF.HI - oldX; diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c index 64a97b39..723050a4 100644 --- a/src/enemy/helmasaur.c +++ b/src/enemy/helmasaur.c @@ -176,7 +176,7 @@ void sub_0802BE18(Entity* this) { if (--this->actionDelay == 0) { this->action = 4; this->actionDelay = 0x1e; - this->nonPlanarMovement = 0x300; + this->speed = 0x300; } else { sub_0802C18C(this); } @@ -196,12 +196,12 @@ void sub_0802BE48(Entity* this) { } void sub_0802BE80(Entity* this) { - this->nonPlanarMovement -= 0x20; - if (0xff < this->nonPlanarMovement) { + this->speed -= 0x20; + if (0xff < this->speed) { sub_0802C1CC(this); } - if (this->nonPlanarMovement > 0) { + if (this->speed > 0) { sub_080AEFE0(this); sub_0802C18C(this); } else { @@ -229,7 +229,7 @@ void sub_0802BEEC(Entity* this) { } else if (!sub_08003FC4(this, 0x1c00)) { this->action = 8; this->actionDelay = 30; - this->nonPlanarMovement = 0x120; + this->speed = 0x120; } } @@ -366,7 +366,7 @@ void sub_0802C1CC(Entity* this) { void sub_0802C218(Entity* this) { this->action = 6; - this->nonPlanarMovement = 0xe0; + this->speed = 0xe0; this->field_0x20 = 0x18000; } diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c index 18b4f87e..453315d8 100644 --- a/src/enemy/keaton.c +++ b/src/enemy/keaton.c @@ -102,7 +102,7 @@ void sub_080324FC(Entity* this) { this->field_0xf--; if (this->field_0xf == 0) { this->action = 4; - this->nonPlanarMovement = 0x1E0; + this->speed = 0x1E0; this->field_0x76.HWORD = 0x46; this->field_0x78.HWORD = 0; *(((u8*)&this->field_0x7a) + 1) = 0; @@ -197,7 +197,7 @@ u32 sub_0803271C(Entity* this) { void sub_08032740(Entity* this) { this->action = 1; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; InitializeAnimation(this, this->animationState); sub_08032650(this); } @@ -205,7 +205,7 @@ void sub_08032740(Entity* this) { void sub_0803275C(Entity* this) { this->action = 5; this->actionDelay = 0x2D; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; InitAnimationForceUpdate(this, this->animationState); sub_0803269C(this, this->direction); sub_080327E0(this); diff --git a/src/enemy/leever.c b/src/enemy/leever.c index 5ce12ee5..b40c63ca 100644 --- a/src/enemy/leever.c +++ b/src/enemy/leever.c @@ -172,13 +172,13 @@ void Leever_Move(Entity* this) { this->field_0x74.HWORD = 1; } - this->nonPlanarMovement = (this->frames.all & 0xf) * 0x20; + this->speed = (this->frames.all & 0xf) * 0x20; if (this->type == LeeverForm_Red) { if ((this->field_0xf++ & 0xf) == 0) { sub_08004596(this, sub_0800132C(this, gUnk_020000B0)); } } else { - this->nonPlanarMovement += 0x40; + this->speed += 0x40; if ((this->field_0xf++ & 0x7) == 0) { sub_08004596(this, sub_0800132C(this, gUnk_020000B0)); } diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c index cea511b4..9c2d526f 100644 --- a/src/enemy/madderpillar.c +++ b/src/enemy/madderpillar.c @@ -115,7 +115,7 @@ void sub_0802999C(Entity* this) { this->action = 1; this->flags |= 0x80; this->direction = DirectionRound(Random()); - this->nonPlanarMovement = 0xa0; + this->speed = 0xa0; this->animationState = 0xff; this->y.WORD += 6; this->parent = this; @@ -135,7 +135,7 @@ void sub_08029A94(Entity* this) { void sub_08029AA4(Entity* this) { if (this->field_0x76.HALF.HI != 0) { this->action = 3; - this->nonPlanarMovement = 0x108; + this->speed = 0x108; this->damageType = 0x6a; this->field_0x7a.HWORD = 0x168; this->field_0x74.HALF.HI = 4; @@ -150,7 +150,7 @@ void sub_08029AE0(Entity* this) { sub_0802A098(this); if (--this->field_0x7a.HWORD == 0) { this->action = 1; - this->nonPlanarMovement = 0xa0; + this->speed = 0xa0; this->field_0x74.HALF.HI = 0; sub_08029EEC(this); sub_0801D2B4(this, 0x77); diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c index d5d7b0e6..24f7e210 100644 --- a/src/enemy/miniFireballGuy.c +++ b/src/enemy/miniFireballGuy.c @@ -38,7 +38,7 @@ void nullsub_23(Entity* this) { void sub_08045618(Entity* this) { this->action = 1; this->spriteSettings.b.draw = 1; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->field_0x3c = this->field_0x3c | 0x10; sub_0804A720(this); InitializeAnimation(this, 1); diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c index 08c94fa7..96e7d615 100644 --- a/src/enemy/miniSlime.c +++ b/src/enemy/miniSlime.c @@ -49,7 +49,7 @@ void nullsub_22(void) { void sub_080452A4(Entity* this) { this->action = 1; this->spriteSettings.b.draw = 1; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; sub_0804A720(this); InitializeAnimation(this, 6); if (this->type2) { @@ -71,8 +71,8 @@ void sub_080452FC(Entity* this) { if (--this->actionDelay == 0) { this->action = 3; this->actionDelay = 1; - if (0 < this->nonPlanarMovement) - this->actionDelay = sub_0806FA04(0x1000, this->nonPlanarMovement) >> 0x8; + if (0 < this->speed) + this->actionDelay = sub_0806FA04(0x1000, this->speed) >> 0x8; if (sub_08049FA0(this) == 0 && (Random() & 3)) { cVar2 = sub_08049EE4(this); diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c index 165bf1eb..07fd3f5a 100644 --- a/src/enemy/peahat.c +++ b/src/enemy/peahat.c @@ -57,14 +57,14 @@ void sub_0801FFDC(Entity* this) { this->field_0x82.HALF.LO = 0; this->animationState = PeahatAnimation_SlicedPropeller; this->action = 5; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->hurtBlinkTime = -30; this->field_0x80.HALF.HI = 0; InitializeAnimation(this, this->animationState); } else if (this->bitfield == 0x9b) { this->animationState = PeahatAnimation_BrokenPropeller; this->action = 5; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->hurtBlinkTime = -30; this->field_0x80.HALF.HI = 0; InitializeAnimation(this, this->animationState); @@ -72,7 +72,7 @@ void sub_0801FFDC(Entity* this) { if (this->animationState == PeahatAnimation_Flying) { this->action = 1; this->actionDelay = 30; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->direction = -1; this->field_0x82.HALF.HI = 0x78; GetNextFrame(this); @@ -152,7 +152,7 @@ void Peahat_Fly(Entity* this) { this->action = 2; this->previousActionFlag = Random() & 3; this->actionDelay = 60; - this->nonPlanarMovement = 160; + this->speed = 160; } } @@ -176,7 +176,7 @@ void Peahat_ChargeStart(Entity* this) { } else { this->action = 3; this->actionDelay = 120; - this->nonPlanarMovement = 192; + this->speed = 192; this->direction = (GetFacingDirection(this, gUnk_020000B0) + gUnk_080CA5D4[Random() & 1]) & 0x1f; } } else { @@ -193,7 +193,7 @@ void Peahat_ChargeTarget(Entity* this) { } if (60 < this->actionDelay) { if (this->actionDelay & 1) - this->nonPlanarMovement += 4; + this->speed += 4; if ((gScreenTransition.frameCount & 3) == 0) sub_08004596(this, GetFacingDirection(this, gUnk_020000B0)); @@ -209,12 +209,12 @@ void Peahat_ChargeEnd(Entity* this) { if (--this->actionDelay == 0) { this->action = 1; this->actionDelay = 1; - this->nonPlanarMovement = 128; + this->speed = 128; this->field_0x82.HALF.HI = 120; GetNextFrame(this); } else { if (this->actionDelay & 1) - this->nonPlanarMovement -= 8; + this->speed -= 8; sub_080AEFE0(this); UpdateAnimationVariableFrames(this, 4); @@ -329,7 +329,7 @@ void PeahatPropeller_Initialize(Entity* this) { this->spriteRendering.b3 = 1; this->spriteOrientation.flipY = 1; this->spriteSettings.b.shadow = 0; - this->nonPlanarMovement = 0x20; + this->speed = 0x20; this->direction = (Random() & 0x10) + 8; InitializeAnimation(this, PeahatAnimation_Propeller); } diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index c3e67cc8..a8d24fa2 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -84,7 +84,7 @@ void sub_08023FF0(Entity* this) { this->flags |= 0x80; this->damageType = 0x77; this->actionDelay = 1; - this->nonPlanarMovement = 0x40; + this->speed = 0x40; } else { gUnk_080CBEF8[this->previousActionFlag](this); } @@ -184,7 +184,7 @@ void sub_080241C0(Entity* this) { if (PlayerInRange(this, 3, (gPlayerState.hurtBlinkSpeed != 0) ? 0xa0 : 0x40) && sub_08049FDC(this, 3) && gPlayerEntity.action != 0x1e) { this->field_0x80.HALF.LO++; - this->nonPlanarMovement = 0; + this->speed = 0; sub_08024A14(this, 3, 10); } else if (--this->field_0xf == 0) { sub_08024A14(this, 0, 0x20); @@ -223,8 +223,8 @@ void sub_080242A0(Entity* this) { if (--this->actionDelay == 0) { this->direction = GetFacingDirection(this, gUnk_020000B0); sub_08024E00(this, 1); - if (this->nonPlanarMovement != 0) { - this->nonPlanarMovement = 0; + if (this->speed != 0) { + this->speed = 0; } else { sub_08024E1C(this); } @@ -236,7 +236,7 @@ void sub_080242A0(Entity* this) { this->action = 4; this->field_0x80.HALF.LO = 0; this->actionDelay = 0x10; - this->nonPlanarMovement = 0; + this->speed = 0; } } } @@ -247,7 +247,7 @@ void sub_0802433C(Entity* this) { case 0: if (--this->actionDelay == 0) { this->field_0x80.HALF.LO++; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; this->field_0xf = 8; sub_08024E00(this, 1); } @@ -256,7 +256,7 @@ void sub_0802433C(Entity* this) { if (--this->actionDelay == 0) { this->action = 5; this->field_0x80.HALF.LO = 0; - this->nonPlanarMovement = 0x140; + this->speed = 0x140; this->actionDelay = 0xc0; this->field_0xf = 8; } else { @@ -275,12 +275,12 @@ void sub_080243B8(Entity* this) { if (this->attachedEntity == NULL || this->attachedEntity->next == NULL) { this->field_0x80.HALF.LO = 2; this->actionDelay = 0x20; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->field_0x82.HALF.HI = 0x80; } else if (sub_08049F1C(this, gUnk_020000B0, 0xe)) { this->field_0x80.HALF.LO++; this->actionDelay = 0x1e; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; this->field_0x82.HALF.HI = 0x80; this->attachedEntity->action = 2; } else if (--this->actionDelay) { @@ -298,14 +298,14 @@ void sub_080243B8(Entity* this) { if (--this->actionDelay == 0) { this->field_0x80.HALF.LO++; this->actionDelay = 0x20; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; } break; case 2: if (--this->actionDelay == 0) { this->action = 6; this->field_0x80.HALF.LO = 0; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; sub_08024B38(this); if ((this->field_0x82.HALF.HI & 0x40) == 0) { @@ -339,7 +339,7 @@ void sub_080244E8(Entity* this) { this->field_0x80.HALF.LO += 1; this->field_0x82.HALF.LO += 1; this->field_0xf = 0; - this->nonPlanarMovement = 0; + this->speed = 0; } else { this->actionDelay = 0x30; this->field_0xf = 4; @@ -368,8 +368,8 @@ void sub_080244E8(Entity* this) { u32 tmp; if (--this->actionDelay == 0) { - if (this->nonPlanarMovement) { - this->nonPlanarMovement = 0; + if (this->speed) { + this->speed = 0; } else { sub_08024E1C(this); } @@ -387,7 +387,7 @@ void sub_080244E8(Entity* this) { this->field_0x80.HALF.LO++; this->actionDelay = 0xc; this->direction = 0x10; - this->nonPlanarMovement = tmp; + this->speed = tmp; this->cutsceneBeh.HALF.LO = 0; this->flags2 &= 0xfc; sub_080249DC(this); @@ -453,7 +453,7 @@ void sub_080244E8(Entity* this) { if (--this->actionDelay == 0) { this->field_0x80.HALF.LO++; this->field_0xf = 0; - this->nonPlanarMovement = 0; + this->speed = 0; this->field_0x82.HALF.LO++; } break; @@ -482,7 +482,7 @@ void sub_080244E8(Entity* this) { this->field_0x80.HALF.LO += 1; this->actionDelay = 0xc0; this->field_0xf = 8; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; sub_080249DC(this); break; default: @@ -496,7 +496,7 @@ void sub_080244E8(Entity* this) { if (this->field_0x82.HALF.HI & 0x80) { this->field_0x82.HALF.HI = 0xc0; this->field_0x80.HALF.LO = 0; - this->nonPlanarMovement = 0x40; + this->speed = 0x40; this->actionDelay = 0x40; this->field_0xf = 8; sub_08024A14(this, 0, 8); @@ -511,7 +511,7 @@ void sub_080244E8(Entity* this) { case 7: if (gPlayerEntity.height.HALF.HI == 0) { this->field_0x80.HALF.LO = 0; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; sub_08024B38(this); } } @@ -709,7 +709,7 @@ bool32 sub_08024C48(Entity* this, bool32 unk) { void sub_08024C7C(Entity* this) { this->action = 1; - this->nonPlanarMovement = 0x40; + this->speed = 0x40; this->actionDelay = 0; sub_08024A14(this, 0, 0x20); } @@ -719,7 +719,7 @@ void sub_08024C94(Entity* this) { this->field_0x80.HALF.LO = 0; this->actionDelay = 0x40; this->field_0xf = 0; - this->nonPlanarMovement = 0xc0; + this->speed = 0xc0; this->field_0x82.HALF.HI = 0x80; sub_08024A14(this, 3, this->field_0xf); } @@ -785,7 +785,7 @@ void sub_08024E00(Entity* this, u32 unk) { } void sub_08024E1C(Entity* this) { - this->nonPlanarMovement = gUnk_080CBF18[sub_08024E34()]; + this->speed = gUnk_080CBF18[sub_08024E34()]; } u32 sub_08024E34(void) { @@ -809,7 +809,7 @@ void sub_08024E4C(Entity* this) { this->field_0x86.HALF.HI = 0; sub_08024F50(this); this->field_0x80.HALF.LO = 0; - this->nonPlanarMovement = 0x40; + this->speed = 0x40; this->actionDelay = 0x40; this->field_0xf = 8; sub_08024A14(this, 0, 8); @@ -851,7 +851,7 @@ void sub_08024F50(Entity* this) { gPlayerEntity.flags |= 0x80; gPlayerEntity.hurtBlinkTime = -0x3c; gPlayerEntity.direction = gPlayerEntity.animationState << 2; - gPlayerEntity.nonPlanarMovement = 0; + gPlayerEntity.speed = 0; gPlayerEntity.spritePriority.b1 = this->cutsceneBeh.HALF.HI; gPlayerEntity.height.HALF.HI = gPlayerEntity.spriteOffsetY; gPlayerEntity.spriteOffsetY = 0; @@ -859,7 +859,7 @@ void sub_08024F50(Entity* this) { this->field_0x82.HALF.HI = 0xc0; this->field_0x80.HALF.LO += 2; this->cutsceneBeh.HALF.LO = 0; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; } // clang-format off diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index 7ef108b4..263b5625 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -101,7 +101,7 @@ void sub_080207A8(Entity* this) { this->field_0x3a &= 0xfb; this->direction ^= 0x10; this->field_0x20 = 0x18000; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; InitializeAnimation(this, this->animationState + 0x10); } @@ -194,7 +194,7 @@ void Rollobite_Unroll(Entity* this) { GetNextFrame(this); if (this->frames.all & 0x80) { this->flags |= 0x80; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; this->damageType = 34; sub_08020A30(this); this->direction = DirectionFromAnimationState(this->animationState); diff --git a/src/enemy/rope.c b/src/enemy/rope.c index e76f8ec1..d1d73723 100644 --- a/src/enemy/rope.c +++ b/src/enemy/rope.c @@ -60,7 +60,7 @@ void sub_08031434(Entity* this) { sub_0804A720(this); this->animationState = 0xff; this->field_0x1c = 1; - this->field_0x7a.HWORD = this->nonPlanarMovement; + this->field_0x7a.HWORD = this->speed; if (!(this->type)) { sub_08031600(this); } else { @@ -112,7 +112,7 @@ void sub_080314FC(Entity* this) { if (u != 0xff) { this->action = 3; this->actionDelay = 0x1e; - this->field_0x7a.HWORD = this->nonPlanarMovement = 0x1a0; + this->field_0x7a.HWORD = this->speed = 0x1a0; this->direction = u; this->animationState = this->direction >> 3; InitializeAnimation(this, this->animationState + 4); @@ -157,7 +157,7 @@ void sub_08031600(Entity* this) { u32 r; this->action = 2; this->actionDelay = (Random() & 0x30) + 0x3c; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->field_0x7a.HWORD = 0x80; r = Random() & 0x18; this->direction = r; @@ -175,6 +175,6 @@ u32 sub_0803163C(Entity* this) { } else { h = this->field_0x7a.HWORD; } - this->nonPlanarMovement = h; + this->speed = h; return ProcessMovement(this); } diff --git a/src/enemy/ropeGolden.c b/src/enemy/ropeGolden.c index b36b9635..606e2c9f 100644 --- a/src/enemy/ropeGolden.c +++ b/src/enemy/ropeGolden.c @@ -88,7 +88,7 @@ void sub_080383AC(Entity* this) { u32 v; this->action = 1; this->actionDelay = 0x8; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; this->direction = DirectionRoundUp(GetFacingDirection(this, &gPlayerEntity)); v = this->direction >> 3; if (v != this->animationState) { @@ -101,7 +101,7 @@ void sub_080383E4(Entity* this) { u32 v; this->action = 2; this->actionDelay = 0x8; - this->nonPlanarMovement = 0x280; + this->speed = 0x280; v = DirectionRoundUp(GetFacingDirection(this, &gPlayerEntity)); this->direction = v; this->field_0x78.HALF.LO = v; diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index 74775cab..64584892 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -239,7 +239,7 @@ void sub_080296D8(Entity* this) { gPlayerEntity.direction = gPlayerEntity.animationState << 2; gPlayerEntity.spritePriority.b1 = this->field_0x80.HALF.LO; gPlayerEntity.spriteOffsetY = 0; - gPlayerEntity.nonPlanarMovement = 0x140; + gPlayerEntity.speed = 0x140; this->action = 5; this->field_0xf = 0x3c; this->flags2 |= 3; diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c index d1bfd125..0aae18f1 100644 --- a/src/enemy/sensorBladeTrap.c +++ b/src/enemy/sensorBladeTrap.c @@ -35,7 +35,7 @@ void sub_0802BA18(Entity* this) { return; this->action = 2; - this->nonPlanarMovement = this->field_0x78.HWORD; + this->speed = this->field_0x78.HWORD; this->direction = direction; switch (direction >> 3) { @@ -87,7 +87,7 @@ void sub_0802BAFC(Entity* this) { void sub_0802BB10(Entity* this) { this->action = 3; - this->nonPlanarMovement = 0xc0; + this->speed = 0xc0; this->direction = this->direction ^ 0x10; EnqueueSFX(0x74); } diff --git a/src/enemy/slime.c b/src/enemy/slime.c index 13782f7a..9609232d 100644 --- a/src/enemy/slime.c +++ b/src/enemy/slime.c @@ -58,7 +58,7 @@ void nullsub_171() { void sub_08044FC8(Entity* this) { this->action = 1; this->spriteSettings.b.draw = 1; - this->nonPlanarMovement = 128; + this->speed = 128; sub_0804A720(this); InitializeAnimation(this, 0); sub_08044FF8(this); @@ -75,8 +75,8 @@ void sub_08045018(Entity* this) { if (--this->actionDelay == 0) { this->action = 3; this->actionDelay = 1; - if (0 < this->nonPlanarMovement) { - this->actionDelay = sub_0806FA04(4096, this->nonPlanarMovement) >> 8; + if (0 < this->speed) { + this->actionDelay = sub_0806FA04(4096, this->speed) >> 8; } if (sub_08049FA0(this) == 0 && (Random() & 3)) { this->direction = (sub_08049EE4(this) + 0xfc + (Random() & 8)) & 24; diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c index a3aebc73..7b6dbbfd 100644 --- a/src/enemy/smallPesto.c +++ b/src/enemy/smallPesto.c @@ -44,7 +44,7 @@ void sub_0803169C(Entity* this) { this->action = 1; this->previousActionFlag = 0; this->flags = this->flags | 0x80; - this->nonPlanarMovement = 0x40; + this->speed = 0x40; this->field_0xf = 1; } else { gUnk_080CE554[this->previousActionFlag](this); diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c index 24009c34..68e0fef5 100644 --- a/src/enemy/spearMoblin.c +++ b/src/enemy/spearMoblin.c @@ -58,7 +58,7 @@ void sub_08028284(Entity* this) { this->attachedEntity->hurtBlinkTime = this->hurtBlinkTime; if (this->currentHealth == 0) { - this->nonPlanarMovement = 0; + this->speed = 0; this->field_0x82.HALF.LO = 0; sub_080287E0(this); DeleteEntity(this->attachedEntity); @@ -86,7 +86,7 @@ void sub_08028314(Entity* this) { if (this->actionDelay) { this->animationState = this->type2 << 1; this->actionDelay = 0x1e; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->direction = this->animationState << 2; sub_080287E0(this); } else { @@ -164,13 +164,13 @@ void sub_08028488(Entity* this) { switch (this->field_0x82.HALF.LO) { case 3: this->action = 4; - this->nonPlanarMovement = 0x180; + this->speed = 0x180; this->direction = sub_08049F84(this, 1); EnqueueSFX(0x11e); break; case 2: this->action = 2; - this->nonPlanarMovement = 0; + this->speed = 0; this->actionDelay = (Random() & 7) * 3 + 0x40; break; case 4: @@ -180,7 +180,7 @@ void sub_08028488(Entity* this) { default: this->action = 1; this->field_0x82.HALF.LO = 1; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->actionDelay = (Random() & 7) * 3 + 0x22; break; } @@ -245,7 +245,7 @@ void sub_08028604(Entity* this) { this->field_0xf = 0; if (this->field_0x82.HALF.LO == 1) { this->actionDelay = gUnk_080CC7BC[Random() & 3]; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; if (sub_08049FA0(this) != 0) { this->direction = gUnk_080CC7D0[Random() & 7] + 0x18 + this->direction & 0x18; } else { @@ -262,7 +262,7 @@ void sub_08028604(Entity* this) { } } else { this->actionDelay = 0xc; - this->nonPlanarMovement = 0; + this->speed = 0; } if (this->direction >> 2 != this->animationState) { @@ -324,7 +324,7 @@ void sub_080287B4(Entity* this) { this->field_0xf = 0; this->field_0x80.HALF.LO = 0; this->field_0x7a.HALF.HI = 0; - this->nonPlanarMovement = 0; + this->speed = 0; this->field_0x82.HALF.LO = 0; sub_080287E0(this); } @@ -371,7 +371,7 @@ void sub_08028858(Entity* this) { this->hitbox->height = box->height; if (this->field_0x82.HALF.LO == 0) { - this->nonPlanarMovement = 0; + this->speed = 0; } ProcessMovement(this); diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c index e1c32ce0..503084e7 100644 --- a/src/enemy/spikedBeetle.c +++ b/src/enemy/spikedBeetle.c @@ -49,7 +49,7 @@ void sub_0802B628(Entity* this) { if (this->action < 6) { this->action = 6; this->field_0x20 = 0x18000; - this->nonPlanarMovement = 0xc0; + this->speed = 0xc0; this->direction = this->field_0x3e; this->field_0x42 = 0; this->hurtBlinkTime = -8; @@ -99,7 +99,7 @@ void sub_0802B7A4(Entity* this) { if (--this->actionDelay == 0) { this->action = 1; this->actionDelay = gUnk_080CD314[Random() & 3]; - this->nonPlanarMovement = 0x60; + this->speed = 0x60; sub_0802B960(this); if (this->direction != 0xff) { u32 animation = this->direction >> 3; @@ -116,7 +116,7 @@ void sub_0802B7FC(Entity* this) { if (--this->actionDelay == 0) { this->action = 4; this->actionDelay = 0x78; - this->nonPlanarMovement = 0x1c0; + this->speed = 0x1c0; } } @@ -166,7 +166,7 @@ void sub_0802B8E0(Entity* this) { } else { this->action = 8; this->field_0x20 = 0x10000; - this->nonPlanarMovement = 0x60; + this->speed = 0x60; this->damageType = 99; InitializeAnimation(this, this->animationState); EnqueueSFX(299); diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c index 873962c9..7bf39713 100644 --- a/src/enemy/spinyChuchu.c +++ b/src/enemy/spinyChuchu.c @@ -158,7 +158,7 @@ void sub_080226EC(Entity* this) { if (sub_080228F0(this)) { this->action = 6; this->field_0x20 = 0x12000; - this->nonPlanarMovement = 0x140; + this->speed = 0x140; this->direction = GetFacingDirection(this, gUnk_020000B0); this->damageType = 0x5a; InitializeAnimation(this, 4); @@ -209,7 +209,7 @@ void sub_0802281C(Entity* this) { GetNextFrame(this); if (this->frames.all & 0x80) { this->action = 2; - this->nonPlanarMovement = 0x20; + this->speed = 0x20; InitializeAnimation(this, 0); sub_0804AA1C(this); } @@ -232,7 +232,7 @@ void sub_0802289C(Entity* this) { GetNextFrame(this); if (this->frames.all & 0x80) { this->action = 2; - this->nonPlanarMovement = 0x20; + this->speed = 0x20; this->field_0x80.HALF.HI = 0x78; InitializeAnimation(this, 0); } diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c index 02bf4e39..bdccd10e 100644 --- a/src/enemy/vaatiBall.c +++ b/src/enemy/vaatiBall.c @@ -155,7 +155,7 @@ void sub_08044868(Entity* this) { if (this->frames.all & 0x80) { this->field_0x74.HALF.LO = 1; this->direction = sub_080045B4(this, vaati->x.HALF.HI, vaati->y.HALF.HI - 0x10); - this->nonPlanarMovement = 0x180; + this->speed = 0x180; } break; case 1: @@ -230,7 +230,7 @@ void sub_080449F8(Entity* this) { if (this->field_0x78.HALF.LO == 0) { this->field_0x78.HALF.LO++; - this->nonPlanarMovement = 640; + this->speed = 640; } this->actionDelay = 4; @@ -321,7 +321,7 @@ void sub_08044B04(Entity* this) { this->field_0xf = 32; } - this->nonPlanarMovement = this->field_0x78.HALF.LO ? 640 : 1280; + this->speed = this->field_0x78.HALF.LO ? 640 : 1280; } } break; @@ -331,7 +331,7 @@ void sub_08044B04(Entity* this) { this->direction = (this->direction + 1) & 0x1f; if (++this->field_0xf == 0x30) { u32 direction = sub_080045B4(this, vaati->x.HALF.HI, vaati->y.HALF.HI - 0x10); - this->nonPlanarMovement = 0; + this->speed = 0; this->direction = (direction + 16) & 0x1f; this->actionDelay = 16; this->field_0xf = 16; @@ -343,32 +343,32 @@ void sub_08044B04(Entity* this) { if (this->field_0xf == 0) { switch (--this->actionDelay) { case 12: - this->nonPlanarMovement = 1280; + this->speed = 1280; break; case 0: this->field_0x74.HALF.LO++; this->direction = sub_080045B4(this, vaati->x.HALF.HI, vaati->y.HALF.HI - 0x10); - this->nonPlanarMovement = 0; + this->speed = 0; this->actionDelay = 4; this->field_0xf = 16; break; case 4: - this->nonPlanarMovement = 640; + this->speed = 640; break; } } else { if (--this->field_0xf == 0) - this->nonPlanarMovement = 640; + this->speed = 640; } break; case 3: if (this->field_0xf) { if (--this->field_0xf == 0) - this->nonPlanarMovement = 640; + this->speed = 640; } else { if (this->actionDelay) { if (--this->actionDelay == 0) { - this->nonPlanarMovement = 1280; + this->speed = 1280; SoundReq(0x14f); } } @@ -450,7 +450,7 @@ void sub_08044DEC(Entity* this) { } this->flags &= 0x7f; this->field_0x78.HALF.LO = 0; - this->nonPlanarMovement = 0x300; + this->speed = 0x300; off = this->parent->field_0x80.HALF.LO - 1; this->direction = gUnk_080D1628[off][this->field_0x78.HALF.HI]; PositionRelative(this->parent, this, 0, -0x100000); @@ -466,11 +466,11 @@ void sub_08044E74(Entity* this, u32 state) { this->direction += 0x18; this->direction &= 0x1f; PositionRelative(this->parent, this, 0, -0x100000); - this->nonPlanarMovement = 12288; + this->speed = 12288; sub_0806F69C(this); this->direction += 0x8; this->direction &= 0x1f; - this->nonPlanarMovement = 1280; + this->speed = 1280; sub_0806F69C(this); break; case 1: @@ -499,5 +499,5 @@ void sub_08044E74(Entity* this, u32 state) { } this->actionDelay = 1; this->field_0x78.HALF.LO = 0; - this->nonPlanarMovement = 1280; + this->speed = 1280; } diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c index a788ad58..d0e5b1a3 100644 --- a/src/enemy/wallMaster2.c +++ b/src/enemy/wallMaster2.c @@ -83,7 +83,7 @@ void sub_0802CD54(Entity* this) { this->action = 2; tmp = Random() >> 0x10; this->actionDelay = tmp; - this->nonPlanarMovement = 0xc0; + this->speed = 0xc0; this->field_0x78.HWORD = gUnk_080CD728[Random() & 3]; this->field_0x7a.HALF.HI = (tmp >> 8) & 0x60; return; @@ -107,7 +107,7 @@ void sub_0802CDE8(Entity* this) { } else { this->action = 1; this->actionDelay = 60; - this->nonPlanarMovement = 0x60; + this->speed = 0x60; this->field_0x7c.HALF.LO = (Random() & 0x38) + 0x96; } GetNextFrame(this); diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c index 87b80940..320fc03d 100644 --- a/src/enemy/waterDrop.c +++ b/src/enemy/waterDrop.c @@ -22,7 +22,7 @@ void sub_0802A250(Entity* this) { this->action = 1; this->actionDelay = 0; this->field_0x20 = -0x30000; - this->nonPlanarMovement = gUnk_080CD03C[Random() & 3]; + this->speed = gUnk_080CD03C[Random() & 3]; this->direction = gUnk_080CD040[Random() & 3] + 0x18; this->collisionLayer = 2; InitializeAnimation(this, 0); diff --git a/src/game.c b/src/game.c index db28c2ab..08d0198a 100644 --- a/src/game.c +++ b/src/game.c @@ -258,7 +258,7 @@ void InitializePlayer(void) { gPlayerState.field_0x34[4] = 0x10; pl->direction = gScreenTransition.playerState << 2; case 0x3: - pl->nonPlanarMovement = 0xe0; + pl->speed = 0xe0; break; case 0x7: case 0x8: diff --git a/src/item11.c b/src/item11.c index 5821d0b5..984d02e0 100644 --- a/src/item11.c +++ b/src/item11.c @@ -32,7 +32,7 @@ void sub_08018CBC(Entity* this) { *(u32*)&this->field_0x80 = this->y.WORD = gPlayerEntity.y.WORD; uVar2 = this->animationState = gPlayerEntity.animationState & 0xe; this->direction = (u8)(uVar2 << 2); - this->nonPlanarMovement = 0x400; + this->speed = 0x400; this->damageType = 0x96; this->field_0x3c = (gPlayerEntity.field_0x3c + 1) | 0x80; this->flags2 = gPlayerEntity.flags2; diff --git a/src/item14.c b/src/item14.c index 7ca56f53..d9537b8b 100644 --- a/src/item14.c +++ b/src/item14.c @@ -19,7 +19,7 @@ void sub_0805FBE8(Entity* this) { this->spriteSettings.b.draw = TRUE; this->field_0x3c = gPlayerEntity.field_0x3c + 1; this->hitbox = &gUnk_08109AD0; - this->nonPlanarMovement = 0x380; + this->speed = 0x380; this->animationState = this->animationState & 0x7f; if (this->collisionLayer == 2) { this->type2 = 1; diff --git a/src/npc/cow.c b/src/npc/cow.c index aeb62982..d5e7988d 100644 --- a/src/npc/cow.c +++ b/src/npc/cow.c @@ -29,7 +29,7 @@ void sub_08068FC0(Entity* ent) { ent->action = 1; ent->animationState = ent->type2; - ent->nonPlanarMovement = 0x40; + ent->speed = 0x40; ent->field_0x6c.HALF.HI = 0xFF; diff --git a/src/npc/postman.c b/src/npc/postman.c index 2701efd1..0accf073 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -51,7 +51,7 @@ void sub_08060428(Entity* this) { void* data; this->actionDelay = 0x5a; - this->nonPlanarMovement = 0x180; + this->speed = 0x180; if (this->type2 != 0) { data = GetCurrentRoomProperty(this->type2); } else { diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index 0785d87a..e50ef501 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -241,7 +241,7 @@ void sub_0806AF78(Entity* this, ScriptExecutionContext* context) { void sub_0806AFA0(Entity* this) { if (sub_0806ED78(this)) { - sub_0806F62C(this, -this->nonPlanarMovement, this->direction); + sub_0806F62C(this, -this->speed, this->direction); } } diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c index cad4e29b..d8b70298 100644 --- a/src/npc/townsperson.c +++ b/src/npc/townsperson.c @@ -208,7 +208,7 @@ void sub_08061E90(Entity* this, Entity* arg1) { } this->direction = (u8)animIndex; this->animationState = sub_0806F5B0(animIndex); - this->nonPlanarMovement = gUnk_0810B74A[this->type]; + this->speed = gUnk_0810B74A[this->type]; } animIndex = (this->animationState >> 1) + 4; if (animIndex != this->animIndex) { diff --git a/src/object/backgroundCloud.c b/src/object/backgroundCloud.c index ceebf3d7..df2625a3 100644 --- a/src/object/backgroundCloud.c +++ b/src/object/backgroundCloud.c @@ -18,7 +18,7 @@ void sub_0808F658(Entity* this) { this->spritePriority.b0 = this->type; this->frameIndex = this->type; this->direction = 8; - this->nonPlanarMovement = gUnk_08121EB0[this->type]; + this->speed = gUnk_08121EB0[this->type]; this->field_0x78.HWORD = gRoomControls.roomOriginX - 0x60; this->field_0x7a.HWORD = gRoomControls.roomOriginX + gRoomControls.width + 0x60; this->animationState = 0; diff --git a/src/object/bird.c b/src/object/bird.c index 2b6f194b..6d126380 100644 --- a/src/object/bird.c +++ b/src/object/bird.c @@ -28,7 +28,7 @@ void sub_0809CF54(Entity* this) { this->field_0x20 = -0x18000; this->height.WORD = -0x38C000; this->field_0x68.HWORD = -0x800; - this->nonPlanarMovement = 0x280; + this->speed = 0x280; this->direction = 8; this->collisionLayer = 2; this->x.HALF.HI = gRoomControls.roomScrollX; diff --git a/src/object/cloud.c b/src/object/cloud.c index a2637b6b..6f10295a 100644 --- a/src/object/cloud.c +++ b/src/object/cloud.c @@ -180,7 +180,7 @@ void sub_0809F7BC(Entity* this) { cloud = sub_0809F770(this); if (cloud != NULL) { uVar1 = Random(); - cloud->nonPlanarMovement = gUnk_081247C8[uVar1 & 3]; + cloud->speed = gUnk_081247C8[uVar1 & 3]; cloud->direction = (u8)(uVar1 >> 8) & 31; } } diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index 51403761..2b4914e1 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -506,7 +506,7 @@ static u32 sub_0808EF6C(Entity* this) { if (this->field_0x6c.HWORD < var7) { var7 = this->field_0x6c.HWORD; } - this->nonPlanarMovement = var7; + this->speed = var7; this->direction = sub_080045DA(var0, var2) >> 3; sub_0806F69C(this); return 1; @@ -517,7 +517,7 @@ static void sub_0808EFF0(Entity* this) { u8 var1; this->spriteSettings.b.draw = 2; - this->nonPlanarMovement = 0x400; + this->speed = 0x400; this->currentHealth = 1; this->frameIndex = 0xFF; this->animIndex = 0xFF; diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c index 0ab2d710..3d511b25 100644 --- a/src/object/greatFairy.c +++ b/src/object/greatFairy.c @@ -159,21 +159,21 @@ void GreatFairy_WingsInit(Entity* this) { this->spriteRendering.alphaBlend = 1; gScreen.controls.layerFXControl = 0xF40; gScreen.controls.alphaBlend = BLDALPHA_BLEND(9, 8); - this->nonPlanarMovement = 1024; + this->speed = 1024; sub_0805EC9C(this, 1024, 256, 0); } void GreatFairy_WingsUpdate(Entity* this) { s32 iVar1; - iVar1 = this->nonPlanarMovement -= 32; + iVar1 = this->speed -= 32; if (iVar1 * 65536 >> 16 == 256) { this->action = 2; sub_0805EC60(this); gRoomVars.greatFairyState |= 32; gActiveScriptInfo.unk_00 |= 4; } else { - sub_0805EC9C(this, this->nonPlanarMovement, 256, 0); + sub_0805EC9C(this, this->speed, 256, 0); } } @@ -260,7 +260,7 @@ void GreatFairy_MiniAffineInit2(Entity* this) { if (this->height.HALF.HI == -20) { this->action = 2; this->actionDelay = 90; - this->nonPlanarMovement = 4096; + this->speed = 4096; this->spriteRendering.b0 = 3; sub_0805EC9C(this, 256, 256, 0); } @@ -275,7 +275,7 @@ void GreatFairy_MiniAffineUpdate(Entity* this) { this->action = 3; sub_0805EC60(this); } else { - iVar2 = this->nonPlanarMovement -= 24; + iVar2 = this->speed -= 24; sub_0805EC9C(this, 256, iVar2 * 0x10000 >> 20, 0); } } @@ -386,7 +386,7 @@ void sub_08087150(Entity* this) { this->spriteOrientation.flipY = 0; this->spriteRendering.b0 = 0; this->spritePriority.b0 = 3; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->direction = 0x10; temp = gUnk_0812079C; this->palette.raw = ((temp & 0xf) << 4) | 0xf; @@ -463,7 +463,7 @@ void sub_080872AC(Entity* this) { this->field_0x68.HWORD = this->x.HALF.HI; this->field_0x6a.HWORD = this->y.HALF.HI; this->direction = (u8)Random() & 0x1F; - this->nonPlanarMovement = 32; + this->speed = 32; GreatFairy_InitializeAnimation(this); } diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index 409c1d04..b794b546 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -141,8 +141,8 @@ static void sub_080810A8(Entity* this) { sub_080814A4(this); if (this->direction & 0x80) { this->direction &= 0x1F; - if (this->nonPlanarMovement == 0) { - this->nonPlanarMovement = 0x100; + if (this->speed == 0) { + this->speed = 0x100; } } else { this->direction |= 0xFF; @@ -259,7 +259,7 @@ void sub_080812A0(Entity* this) { void sub_080812A8(Entity* this) { if (sub_080002D0(this) != 0xF && this->field_0x6e.HWORD != GetTileTypeByEntity(this)) { this->direction = 0; - this->nonPlanarMovement = 0; + this->speed = 0; this->spriteSettings.b.draw = 1; this->field_0x68.HALF.HI = 0; sub_080810A8(this); diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c index 55c8b261..88ab3308 100644 --- a/src/object/metalDoor.c +++ b/src/object/metalDoor.c @@ -25,7 +25,7 @@ void sub_080A0684(Entity* this) { DeleteThisEntity(); } this->action = 1; - this->nonPlanarMovement = 0x300; + this->speed = 0x300; this->spriteSettings.b.draw = 0; this->frameIndex = 0; this->spriteSettings.b.flipY = 1; diff --git a/src/object/minecart.c b/src/object/minecart.c index 53d1ff82..1e239be3 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -51,7 +51,7 @@ void sub_080916EC(Entity* this) { this->field_0x40 = 0x44; this->flags2 = 0x80; this->direction = DirectionFromAnimationState(this->animationState); - this->nonPlanarMovement = 0x700; + this->speed = 0x700; this->spritePriority.b1 = 3; InitAnimationForceUpdate(this, this->type2 + 4 + this->animationState); SetTile(0x4022, COORD_TO_TILE(this), this->collisionLayer); @@ -81,7 +81,7 @@ void sub_080917DC(Entity* this) { gPlayerState.jumpStatus = 0x81; gPlayerState.flags.all |= 0x4000000; gPlayerEntity.field_0x20 = 0x20000; - gPlayerEntity.nonPlanarMovement = 0x100; + gPlayerEntity.speed = 0x100; gPlayerEntity.flags &= 0x7f; ResetPlayer(); sub_0807A108(); @@ -143,7 +143,7 @@ void sub_080919AC(Entity* this) { } } else { this->flags = this->flags | 0x80; - gPlayerEntity.nonPlanarMovement = 0; + gPlayerEntity.speed = 0; sub_0806F69C(this); CopyPosition(this, &gPlayerEntity); gPlayerEntity.spritePriority.b0 = this->spritePriority.b0 - 1; @@ -176,7 +176,7 @@ void sub_080919AC(Entity* this) { gPlayerState.jumpStatus = 0x41; gPlayerState.flags.all = (gPlayerState.flags.all ^ 0x1000) | 0x4000000; gPlayerEntity.field_0x20 = 0x20000; - gPlayerEntity.nonPlanarMovement = 0x200; + gPlayerEntity.speed = 0x200; gPlayerEntity.animationState = this->animationState << 1; gPlayerEntity.direction = this->direction; gPlayerEntity.flags |= 0x80; diff --git a/src/object/object1A.c b/src/object/object1A.c index 26ece918..837884a9 100644 --- a/src/object/object1A.c +++ b/src/object/object1A.c @@ -54,5 +54,5 @@ void sub_08086A6C(Entity* ent) { uVar1 = Random(); ent->field_0x20 = 163840; ent->direction = (uVar1 >> 16) & 31; - ent->nonPlanarMovement = uVar1 & 480; + ent->speed = uVar1 & 480; } diff --git a/src/object/objectA2.c b/src/object/objectA2.c index 01fd9fa6..e79c07f8 100644 --- a/src/object/objectA2.c +++ b/src/object/objectA2.c @@ -105,6 +105,6 @@ void sub_0809F448(Entity* this) { tmp += -0x80000 + (rand & 0xFFFFF); break; } - this->nonPlanarMovement = (tmp > 0 ? tmp : -tmp) / (tmp2->unk_1 << 8); + this->speed = (tmp > 0 ? tmp : -tmp) / (tmp2->unk_1 << 8); this->direction = sub_080045DA(tmp, 0) >> 3; } diff --git a/src/object/objectB2.c b/src/object/objectB2.c index 4722d2e9..c3eff1eb 100644 --- a/src/object/objectB2.c +++ b/src/object/objectB2.c @@ -22,12 +22,12 @@ void ObjectB2(Entity* this) { this->attachedEntity = pEVar3; InitializeAnimation(this, this->type); } - this->nonPlanarMovement = this->parent->nonPlanarMovement; + this->speed = this->parent->speed; sub_0806F69C(this); if (sub_080AE4CC(this->attachedEntity, this->x.HALF.HI, this->y.HALF.HI, 9) != 0) { DeleteThisEntity(); } - if (this->nonPlanarMovement < 0x41) { + if (this->speed < 0x41) { this->spriteSettings.b.draw ^= 1; if (--this->actionDelay == 0) { diff --git a/src/object/pot.c b/src/object/pot.c index cd73f9a8..f28fb9ee 100644 --- a/src/object/pot.c +++ b/src/object/pot.c @@ -34,7 +34,7 @@ void sub_0808222C(Entity* this) { this->action = 1; this->hitbox = &gUnk_080FD338; - this->nonPlanarMovement = 0x80; + this->speed = 0x80; this->y.HALF.HI += 3; this->field_0x16 = 0; this->flags |= 0x80; @@ -86,7 +86,7 @@ void sub_08082310(Entity* this) { this->actionDelay = 32; this->action = 4; if (gPlayerState.flags.all & 0x80) { - this->nonPlanarMovement >>= 1; + this->speed >>= 1; this->actionDelay = 64; } SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); @@ -185,7 +185,7 @@ void sub_08082614(Entity* this) { this->action = 1; if (gPlayerState.flags.all & 0x80) { - this->nonPlanarMovement <<= 1; + this->speed <<= 1; } this->field_0x70.HALF.LO = sub_080001DA(COORD_TO_TILE(this), this->collisionLayer); diff --git a/src/object/smoke.c b/src/object/smoke.c index 5ec708b9..ade9d2cd 100644 --- a/src/object/smoke.c +++ b/src/object/smoke.c @@ -37,7 +37,7 @@ void sub_0808A46C(Entity* this) { void sub_0808A484(Entity* this) { this->action = 1; this->spriteSettings.b.draw = TRUE; - this->nonPlanarMovement = 0x40; + this->speed = 0x40; this->direction = 6; this->spriteRendering.b3 = 1; this->spritePriority.b0 = 0; diff --git a/src/player.c b/src/player.c index e3038077..7dfcbb93 100644 --- a/src/player.c +++ b/src/player.c @@ -143,7 +143,7 @@ void sub_08070D20(Entity* this) { void sub_08070D38(Entity* this) { this->flags &= ~0x80; this->direction = ((this->animationState & 0xe) << 2) ^ 0x10; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; this->field_0x42 = 0; this->previousActionFlag++; this->actionDelay = gPlayerState.field_0x38; @@ -353,7 +353,7 @@ void sub_080710A8(Entity* this) { asm("lsl r0, r0, #0x4"); this->field_0x20 = (temp - 4) * 64 * 64; - this->nonPlanarMovement = 0x100; + this->speed = 0x100; sub_0807A108(); SoundReq(0x7c); SoundReq(0x78); @@ -522,7 +522,7 @@ void sub_08071400(Entity* this) { if ((this->x.HALF.HI != x) || (this->y.HALF.HI != y)) { this->direction = sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, gArea.field_0x12, gArea.field_0x14); - this->nonPlanarMovement = 0x100; + this->speed = 0x100; sub_08079E08(); } diff --git a/src/room.c b/src/room.c index 6a0e9fad..bd520be3 100644 --- a/src/room.c +++ b/src/room.c @@ -972,7 +972,7 @@ void sub_0804BF38(u32 arg0, struct_0804BF38* arg1) fx->x.HALF.HI = gUnk_080D8E50[iVar3].x + gRoomControls.roomOriginX + xOff; fx->y.HALF.HI = gUnk_080D8E50[iVar3].y + gRoomControls.roomOriginY + -0xc + (entCnt & 1) * 8; fx->direction = 0; - fx->nonPlanarMovement = 0x100; + fx->speed = 0x100; } } } diff --git a/src/script.c b/src/script.c index cc9636b8..6e4d577a 100644 --- a/src/script.c +++ b/src/script.c @@ -113,7 +113,7 @@ void ScriptCommand_0807EB74(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EB8C(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetEntityDirection(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetEntityDirectionWithAnimationState(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_SetEntityNonPlanarMovement(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetEntitySpeed(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetEntity0x20(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetEntityPositionRelative(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetEntityPosition(Entity* entity, ScriptExecutionContext* context); @@ -260,7 +260,7 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop, ScriptCommand_0807EB8C, ScriptCommand_SetEntityDirection, ScriptCommand_SetEntityDirectionWithAnimationState, - ScriptCommand_SetEntityNonPlanarMovement, + ScriptCommand_SetEntitySpeed, ScriptCommand_SetEntity0x20, ScriptCommand_SetEntityPositionRelative, ScriptCommand_SetEntityPosition, @@ -1253,8 +1253,8 @@ void ScriptCommand_SetEntityDirectionWithAnimationState(Entity* entity, ScriptEx entity->animationState = entity->direction / 4; } -void ScriptCommand_SetEntityNonPlanarMovement(Entity* entity, ScriptExecutionContext* context) { - entity->nonPlanarMovement = context->scriptInstructionPointer[1]; +void ScriptCommand_SetEntitySpeed(Entity* entity, ScriptExecutionContext* context) { + entity->speed = context->scriptInstructionPointer[1]; } void ScriptCommand_SetEntity0x20(Entity* entity, ScriptExecutionContext* context) { @@ -1391,7 +1391,7 @@ void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context) { } tmp = entity->x.HALF.HI - context->x.HALF.HI; tmp2 = entity->y.HALF.HI - context->y.HALF.HI; - sub_0806F62C(entity, entity->nonPlanarMovement, entity->direction); + sub_0806F62C(entity, entity->speed, entity->direction); tmp *= entity->x.HALF.HI - context->x.HALF.HI; tmp2 *= entity->y.HALF.HI - context->y.HALF.HI; if (tmp <= 0 && tmp2 <= 0) {