Apply renaming

3 files changed, 253 insertions, 253 deletions

diff --git a/data/scripts/ezlo_angry.inc b/data/scripts/ezlo_angry.inc
index d7a8a893..fac9d78b 100644
--- a/data/scripts/ezlo_angry.inc
+++ b/data/scripts/ezlo_angry.inc
@@ -1,231 +1,231 @@
 SCRIPT_START gUnk_080126FC
-sub_0807E004
-sub_0807EBC0 0x0040
-sub_0807EF80 0x0007
-sub_0807E014
-sub_0807E930 0x0020
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0022
-sub_0807E10C sub_0807F3C8
-sub_0807EAD0 0x1102, 0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0021
-sub_0807E10C sub_0807F3C8
-sub_0807EAD0 0x1103,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807EF80 0x0004
-sub_0807E680 0x003c
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807EF80 0x0011
-sub_0807E930 0x001c
-sub_0807EAD0 0x1105,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0022
-sub_0807E10C sub_0807F3C8
-sub_0807EAD0 0x1106,0x000c
-sub_0807EA94 
-sub_0807E930 0x001c
-sub_0807E10C sub_0806D96C // Ezlo Angry FX 
-sub_0807EAD0 0x1107,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0021
-sub_0807E10C sub_0807F3C8 // Ezlo Angry FX 
-sub_0807EAD0 0x1108,0x000c
-sub_0807EA94 
-sub_0807E930 0x001c
-sub_0807E10C sub_0806D96C// Ezlo Angry FX 
-sub_0807EAD0 0x1109,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807EF80 0x000a
-sub_0807E9D4 
-sub_0807E5F8 0x00000008
-sub_0807E014 
-sub_0807E004 
-sub_0807E260 0x0000
-sub_0807E050 0x0028
-sub_0807E2E4 
-sub_0807E064 0xfff0
-sub_0807E014 
-sub_0807E864 
-sub_0807E10C sub_0806D944  // Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x1114,0x000c
-sub_0807EA94 
-sub_0807E930 0x0020
-sub_0807E878 
-sub_0807E024 0xffd0
-sub_0807E864 
-sub_0807E9DC 
-sub_0807E124 sub_0807F5B0,0x0000003c
-sub_0807E10C sub_080791D0 
-sub_0807E014 
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807EF80 0x000b
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E10C sub_0806D944// Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x110a,0x000c
-sub_0807EA94 
-sub_0807E930 0x001f
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0010
-sub_0807EAD0 0x110b,0x000c
-sub_0807EA94 
-sub_0807E930 0x001f
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807EF80 0x0004
-sub_0807E680 0x003c
-sub_0807E930 0x0010
-sub_0807EAD0 0x110c,0x000c
-sub_0807EA94 
-sub_0807E930 0x001f
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0010
-sub_0807EAD0 0x110d,0x000c
-sub_0807EA94 
-sub_0807E930 0x001f
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E930 0x0010
-sub_0807EAD0 0x110e,0x000c
-sub_0807EA94 
-sub_0807E930 0x0018
-sub_0807EBC0 0x0080
-sub_0807E10C sub_0806D908 
-sub_0807EC1C 0x0010
-sub_0807EF80 0x000a
-sub_0807E9D4 
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E014 
-sub_0807E004 
-sub_0807E10C sub_0806D944 // Ezlo look at player
-sub_0807E2E4 
-sub_0807E050 0x000e
-sub_0807E2A8 0x3030
-sub_0807E064 0x0020
-sub_0807E024 0xffe6
-sub_0807E864 
-sub_0807E930 0x0010
-sub_0807E014 
-sub_0807EAD0 0x1115,0x000c
-sub_0807EA94 
-sub_0807E930 0x0018
-sub_0807E878 
-sub_0807E024 0xffcc
-sub_0807E014 
-sub_0807E864 
-sub_0807E10C sub_0807F9A4
-sub_0807E10C sub_0807DF28
-sub_0807EB8C 
-sub_0807E10C sub_0806D944 // Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x110f,0x000c
-sub_0807E930 0x0018
-sub_0807EBC0 0x0080
-sub_0807E10C sub_0806D908
-sub_0807EC1C 0x0050
-sub_0807EA94 
-sub_0807E10C sub_0807DF50 
-sub_0807E878 
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E014 
-sub_0807E004 
-sub_0807E10C sub_0806D944 // Ezlo look at player
-sub_0807E2E4 
-sub_0807E050 0x000e
-sub_0807E2A8 0x3030
-sub_0807E064 0x0020
-sub_0807E024 0xffe6
-sub_0807E864 
-sub_0807E930 0x0010
-sub_0807E014 
-sub_0807EAD0 0x1115,0x000c
-sub_0807EA94 
-sub_0807E930 0x0018
-sub_0807E878 
-sub_0807E024 0xffcc
-sub_0807E014 
-sub_0807E864 
-sub_0807E10C sub_0807F9A4 
-sub_0807E10C sub_0807DF28 
-sub_0807EB8C 
-sub_0807E10C sub_0806D944  // Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x1110,0x000c
-sub_0807E930 0x0018
-sub_0807EBC0 0x0080
-sub_0807E10C sub_0806D908 
-sub_0807EC1C 0x0050
-sub_0807E930 0x0018
-sub_0807EA94 
-sub_0807E10C sub_0807DF50 
-sub_0807E878 
-sub_0807E5F8 0x00000008
-sub_0807E6AC 0x00000004
-sub_0807E014 
-sub_0807E004 
-sub_0807E10C sub_0806D944  // Ezlo look at player
-sub_0807E2E4 
-sub_0807E050 0x000e
-sub_0807E2A8 0x3030
-sub_0807E064 0x0020
-sub_0807E024 0xffe6
-sub_0807E864 
-sub_0807E930 0x0010
-sub_0807E014 
-sub_0807EAD0 0x1115,0x000c
-sub_0807EA94 
-sub_0807E930 0x0018
-sub_0807E878 
-sub_0807E024 0xffcc
-sub_0807E014 
-sub_0807E864 
-sub_0807E10C sub_0807F9A4 
-sub_0807E10C sub_0807DF28 
-sub_0807EFE4 
-sub_0807EF80 0x000b
-sub_0807EB8C 
-sub_0807E10C sub_0806D944  // Ezlo look at player
-sub_0807E930 0x0010
-sub_0807EAD0 0x1111,0x000c
-sub_0807E930 0x0018
-sub_0807EBC0 0x0080
-sub_0807E10C sub_0806D8A0 
-sub_0807EE30 
-sub_0807E064 0xfffc
-sub_0807E930 0x001f
-sub_0807EA94 
-sub_0807E8C4 0x08012b18
-sub_0807E10C sub_0806D9A4 
-sub_0807EF80 0x0008
-sub_0807E680 0x0078
-sub_0807EFAC 0x000e
-sub_0807E004 
-sub_0807E8E4_2 
-sub_0807EB28 0x1112
-sub_0807E014 
-sub_0807EA94 
-sub_0807E5F8 0x00000008
-sub_0807EF80 0x0006
+StartScript
+SetEntityNonPlanarMovement 0x0040
+_0807EF80 0x0007
+StopScript
+_0807E930 0x0020
+WaitForSomething2 0x00000004
+_0807E930 0x0022
+Call sub_0807F3C8
+TextboxNoOverlapFollowPos 0x1102, 0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0021
+Call sub_0807F3C8
+TextboxNoOverlapFollowPos 0x1103,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0011
+_0807E930 0x001c
+TextboxNoOverlapFollowPos 0x1105,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0022
+Call sub_0807F3C8
+TextboxNoOverlapFollowPos 0x1106,0x000c
+_0807EA94 
+_0807E930 0x001c
+Call sub_0806D96C // Ezlo Angry FX 
+TextboxNoOverlapFollowPos 0x1107,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0021
+Call sub_0807F3C8 // Ezlo Angry FX 
+TextboxNoOverlapFollowPos 0x1108,0x000c
+_0807EA94 
+_0807E930 0x001c
+Call sub_0806D96C// Ezlo Angry FX 
+TextboxNoOverlapFollowPos 0x1109,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807EF80 0x000a
+_0807E9D4 
+_0807E5F8 0x00000008
+StopScript 
+StartScript 
+CheckRoomFlag 0x0000
+JumpIf 0x0028
+CheckEntityInteractType 
+JumpIfNot 0xfff0
+StopScript 
+_0807E864 
+Call sub_0806D944  // Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x1114,0x000c
+_0807EA94 
+_0807E930 0x0020
+_0807E878 
+Jump 0xffd0
+_0807E864 
+_0807E9DC 
+CallWithArg sub_0807F5B0,0x0000003c
+Call sub_080791D0 
+StopScript 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x000b
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+Call sub_0806D944// Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110a,0x000c
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110b,0x000c
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807EF80 0x0004
+Wait 0x003c
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110c,0x000c
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110d,0x000c
+_0807EA94 
+_0807E930 0x001f
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110e,0x000c
+_0807EA94 
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call sub_0806D908 
+_0807EC1C 0x0010
+_0807EF80 0x000a
+_0807E9D4 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+StopScript 
+StartScript 
+Call sub_0806D944 // Ezlo look at player
+CheckEntityInteractType 
+JumpIf 0x000e
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0x0020
+Jump 0xffe6
+_0807E864 
+_0807E930 0x0010
+StopScript 
+TextboxNoOverlapFollowPos 0x1115,0x000c
+_0807EA94 
+_0807E930 0x0018
+_0807E878 
+Jump 0xffcc
+StopScript 
+_0807E864 
+Call sub_0807F9A4
+Call sub_0807DF28
+_0807EB8C 
+Call sub_0806D944 // Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x110f,0x000c
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call sub_0806D908
+_0807EC1C 0x0050
+_0807EA94 
+Call sub_0807DF50 
+_0807E878 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+StopScript 
+StartScript 
+Call sub_0806D944 // Ezlo look at player
+CheckEntityInteractType 
+JumpIf 0x000e
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0x0020
+Jump 0xffe6
+_0807E864 
+_0807E930 0x0010
+StopScript 
+TextboxNoOverlapFollowPos 0x1115,0x000c
+_0807EA94 
+_0807E930 0x0018
+_0807E878 
+Jump 0xffcc
+StopScript 
+_0807E864 
+Call sub_0807F9A4 
+Call sub_0807DF28 
+_0807EB8C 
+Call sub_0806D944  // Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x1110,0x000c
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call sub_0806D908 
+_0807EC1C 0x0050
+_0807E930 0x0018
+_0807EA94 
+Call sub_0807DF50 
+_0807E878 
+_0807E5F8 0x00000008
+WaitForSomething2 0x00000004
+StopScript 
+StartScript 
+Call sub_0806D944  // Ezlo look at player
+CheckEntityInteractType 
+JumpIf 0x000e
+CheckPlayerInRegion2 0x3030
+JumpIfNot 0x0020
+Jump 0xffe6
+_0807E864 
+_0807E930 0x0010
+StopScript 
+TextboxNoOverlapFollowPos 0x1115,0x000c
+_0807EA94 
+_0807E930 0x0018
+_0807E878 
+Jump 0xffcc
+StopScript 
+_0807E864 
+Call sub_0807F9A4 
+Call sub_0807DF28 
+SoundReq0x80100000 
+_0807EF80 0x000b
+_0807EB8C 
+Call sub_0806D944  // Ezlo look at player
+_0807E930 0x0010
+TextboxNoOverlapFollowPos 0x1111,0x000c
+_0807E930 0x0018
+SetEntityNonPlanarMovement 0x0080
+Call sub_0806D8A0 
+_0807EE30 
+JumpIfNot 0xfffc
+_0807E930 0x001f
+_0807EA94 
+StartPlayerScript 0x08012b18
+Call sub_0806D9A4 
+_0807EF80 0x0008
+Wait 0x0078
+SoundReq2 0x000e
+StartScript 
+_0807E8E4_2 
+_0807EB28 0x1112
+StopScript 
+_0807EA94 
+_0807E5F8 0x00000008
+_0807EF80 0x0006
 SCRIPT_END
\ No newline at end of file
diff --git a/data/scripts/gUnk_0800A8D4.inc b/data/scripts/gUnk_0800A8D4.inc
index df47f574..e9b22a64 100644
--- a/data/scripts/gUnk_0800A8D4.inc
+++ b/data/scripts/gUnk_0800A8D4.inc
@@ -1,14 +1,14 @@
-sub_0807E004 
-sub_0807EF80 0x0007
-sub_0807EB44 0x0004
-sub_0807E930 0x0008
-sub_0807E014 
-sub_0807E690 0x00000001
-sub_0807EF80 0x0000
-sub_0807E6AC 0x00000020
-sub_0807EF80 0x0004
-sub_0807E680 0x003c
-sub_0807EB44 0x0002
-sub_0807E680 0x000f
+ScriptCommand_StartScript 
+ScriptCommand_0807EF80 0x0007
+ScriptCommand_0807EB44 0x0004
+ScriptCommand_0807E930 0x0008
+ScriptCommand_StopScript 
+ScriptCommand_WaitForSomething 0x00000001
+ScriptCommand_0807EF80 0x0000
+ScriptCommand_WaitForSomething2 0x00000020
+ScriptCommand_0807EF80 0x0004
+ScriptCommand_Wait 0x003c
+ScriptCommand_0807EB44 0x0002
+ScriptCommand_Wait 0x000f
 .short 0x0861
 .short 0x0006
diff --git a/data/scripts/npc4e_fusion.inc b/data/scripts/npc4e_fusion.inc
index 68262d0e..6a21fd23 100644
--- a/data/scripts/npc4e_fusion.inc
+++ b/data/scripts/npc4e_fusion.inc
@@ -1,16 +1,16 @@
 SCRIPT_START gUnk_08016030
-sub_0807E004 
-sub_0807E40C 0x0009
-sub_0807E050 0x002a
-sub_0807E014 
-sub_0807E6AC 0x00000001
-sub_0807EF80 0x0010
-sub_0807E680 0x003c
-sub_0807EBC0 0x0020
-sub_0807ECF4 0x0080
-sub_0807E680 0x001e
-sub_0807EF80 0x0010
-sub_0807E5F8 0x0000008
+StartScript 
+CheckKinstoneFused 0x0009
+JumpIf 0x002a
+StopScript 
+WaitForSomething2 0x00000001
+_0807EF80 0x0010
+Wait 0x003c
+SetEntityNonPlanarMovement 0x0020
+_0807ECF4 0x0080
+Wait 0x001e
+_0807EF80 0x0010
+_0807E5F8 0x0000008
 .short 0xffff
 .short 0x0c6a
 .short 0xfff0