From 33b1445debb8b08a2cba349732d615b0a201cfd4 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Sat, 6 Mar 2021 14:08:28 +0100 Subject: Prefix script files with script_ instead of gUnk_ --- data/scripts/script_0801550C.inc | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 data/scripts/script_0801550C.inc (limited to 'data/scripts/script_0801550C.inc') diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc new file mode 100644 index 00000000..c2bf4230 --- /dev/null +++ b/data/scripts/script_0801550C.inc @@ -0,0 +1,44 @@ +SCRIPT_START script_0801550C +StartScript +SetEntityNonPlanarMovement 0x0080 +_0807EF80 0x0007 +_0807EB44 0x0000 +Call sub_0807F338 +StopScript +CallWithArg sub_0806AF60, 0x00000000 +WaitForSomething2 0x00008000 +CallWithArg sub_0806AF60, 0x00000004 +_0807EDD4 0x0078, 0x00b8 +_0807EB44 0x0000 +CallWithArg sub_0806AF60, 0x00000000 +_0807E5F8 0x00010000 +WaitForSomething2 0x00008000 +_0807EF80 0x000d +_0807EB44 0x0000 +CallWithArg sub_0806AF60, 0x00000004 +_0807EDD4 0x0078, 0x00c8 +_0807E5F8 0x00010000 +WaitForSomething2 0x00008000 +_0807EB44 0x0000 +CallWithArg sub_0806AF60, 0x00000000 +_0807EF80 0x0010 +Wait 0x0028 +SoundReq 0x0125 +CallWithArg sub_0807FB28, 0x00000003 +Wait 0x000a +SoundReq 0x0125 +CallWithArg sub_0807FB28, 0x00000003 +Wait 0x000a +_0807EF80 0x0010 +_0807E5F8 0x00010000 +WaitForSomething2 0x00008000 +_0807E930 0x000d +Call sub_0807F2D4 +_0807E5F8 0x00010000 +Wait 0x003c +_0807EF80 0x0005 +Wait 0x003c +CheckRoomFlag 0x0001 +JumpIfNot 0xfffa +_0807EF80 0x0006 +SCRIPT_END -- cgit v1.2.3 From 15f480dc0f99437a5ff08c5a8c5c037107b89663 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Sat, 6 Mar 2021 15:53:39 +0100 Subject: Add labels for relative jumps --- data/scripts/script_0801550C.inc | 85 ++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 42 deletions(-) (limited to 'data/scripts/script_0801550C.inc') diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index c2bf4230..e7cf2435 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,44 +1,45 @@ SCRIPT_START script_0801550C -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -_0807EB44 0x0000 -Call sub_0807F338 -StopScript -CallWithArg sub_0806AF60, 0x00000000 -WaitForSomething2 0x00008000 -CallWithArg sub_0806AF60, 0x00000004 -_0807EDD4 0x0078, 0x00b8 -_0807EB44 0x0000 -CallWithArg sub_0806AF60, 0x00000000 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807EF80 0x000d -_0807EB44 0x0000 -CallWithArg sub_0806AF60, 0x00000004 -_0807EDD4 0x0078, 0x00c8 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807EB44 0x0000 -CallWithArg sub_0806AF60, 0x00000000 -_0807EF80 0x0010 -Wait 0x0028 -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -Wait 0x000a -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -Wait 0x000a -_0807EF80 0x0010 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807E930 0x000d -Call sub_0807F2D4 -_0807E5F8 0x00010000 -Wait 0x003c -_0807EF80 0x0005 -Wait 0x003c -CheckRoomFlag 0x0001 -JumpIfNot 0xfffa -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0007 + _0807EB44 0x0000 + Call sub_0807F338 + StopScript + CallWithArg sub_0806AF60, 0x00000000 + WaitForSomething2 0x00008000 + CallWithArg sub_0806AF60, 0x00000004 + _0807EDD4 0x0078, 0x00b8 + _0807EB44 0x0000 + CallWithArg sub_0806AF60, 0x00000000 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807EF80 0x000d + _0807EB44 0x0000 + CallWithArg sub_0806AF60, 0x00000004 + _0807EDD4 0x0078, 0x00c8 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807EB44 0x0000 + CallWithArg sub_0806AF60, 0x00000000 + _0807EF80 0x0010 + Wait 0x0028 + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + Wait 0x000a + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + Wait 0x000a + _0807EF80 0x0010 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807E930 0x000d + Call sub_0807F2D4 + _0807E5F8 0x00010000 + Wait 0x003c + _0807EF80 0x0005 + Wait 0x003c +script_080155E6: + CheckRoomFlag 0x0001 + JumpIfNot script_080155E6 + _0807EF80 0x0006 SCRIPT_END -- cgit v1.2.3 From 74e48d98b0edef729d90e070b65df748ecf3206f Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Sat, 6 Mar 2021 22:44:09 +0100 Subject: Rename to Begin/EndBlock --- data/scripts/script_0801550C.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/script_0801550C.inc') diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index e7cf2435..678b91a9 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0801550C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EB44 0x0000 Call sub_0807F338 - StopScript + EndBlock CallWithArg sub_0806AF60, 0x00000000 WaitForSomething2 0x00008000 CallWithArg sub_0806AF60, 0x00000004 -- cgit v1.2.3 From 5e2af32bb11f35dee966343959d955147c660204 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Tue, 9 Mar 2021 01:28:13 +0100 Subject: named some stuff --- data/scripts/script_0801550C.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts/script_0801550C.inc') diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index 678b91a9..9ec275ae 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801550C BeginBlock SetEntityNonPlanarMovement 0x0080 - _0807EF80 0x0007 + DoPostScriptAction 0x0007 _0807EB44 0x0000 Call sub_0807F338 EndBlock @@ -13,7 +13,7 @@ SCRIPT_START script_0801550C CallWithArg sub_0806AF60, 0x00000000 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 - _0807EF80 0x000d + DoPostScriptAction 0x000d _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00c8 @@ -21,7 +21,7 @@ SCRIPT_START script_0801550C WaitForSomething2 0x00008000 _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000000 - _0807EF80 0x0010 + DoPostScriptAction 0x0010 Wait 0x0028 SoundReq 0x0125 CallWithArg sub_0807FB28, 0x00000003 @@ -29,17 +29,17 @@ SCRIPT_START script_0801550C SoundReq 0x0125 CallWithArg sub_0807FB28, 0x00000003 Wait 0x000a - _0807EF80 0x0010 + DoPostScriptAction 0x0010 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807E930 0x000d Call sub_0807F2D4 _0807E5F8 0x00010000 Wait 0x003c - _0807EF80 0x0005 + DoPostScriptAction 0x0005 Wait 0x003c script_080155E6: CheckRoomFlag 0x0001 JumpIfNot script_080155E6 - _0807EF80 0x0006 + DoPostScriptAction 0x0006 SCRIPT_END -- cgit v1.2.3 From e251d79ffd4ee1c4b10def3ecb41f2d572c63664 Mon Sep 17 00:00:00 2001 From: theo3 Date: Sat, 13 Mar 2021 01:14:46 -0800 Subject: =?UTF-8?q?quick=20fix=20=F0=9F=99=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/scripts/script_0801550C.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/script_0801550C.inc') 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 -- cgit v1.2.3