naming stuff

36 files changed, 93 insertions, 93 deletions

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index ea5bc570..fefd4eb1 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -428,7 +428,7 @@
 	.2byte \s
 .endm
 
-.macro _0807E914 w
+.macro SetIntVariable w
 	.2byte 0x0c4e
 	.4byte \w
 .endm
@@ -502,20 +502,20 @@
 	.2byte \s
 .endm
 
-.macro _0807EAF0 a,b
+.macro TextboxNoOverlapFollowTable a,b
 	.2byte 0x0c5d
 	.2byte \a
 	.2byte \b
 .endm
 
-.macro _0807EAF0_3 a,b,c
+.macro TextboxNoOverlapFollowTable_3 a,b,c
 	.2byte 0x105d
 	.2byte \a
 	.2byte \b
 	.2byte \c
 .endm
 
-.macro _0807EAF0_4 a,b,c,d
+.macro TextboxNoOverlapFollowTable_4 a,b,c,d
 	.2byte 0x145d
 	.2byte \a
 	.2byte \b
diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc
index 23aeca90..4ac7bfc3 100644
--- a/data/scripts/script_08008D8C.inc
+++ b/data/scripts/script_08008D8C.inc
@@ -94,7 +94,7 @@ script_08008E12:
 	WaitForSomething2 0x00000002
 	_0807F034 0x0047
 	WaitPlayerAction8 
-	_0807E914 0x00000003
+	SetIntVariable 0x00000003
 	Call sub_0807F420
 	_0807E8E4_0 
 	_0807E5F8 0x00000080
diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc
index bc773cc5..42f99fd4 100644
--- a/data/scripts/script_0800939A.inc
+++ b/data/scripts/script_0800939A.inc
@@ -18,10 +18,10 @@ script_080093BC:
 	Call sub_0806D70C
 	Jump script_08009376
 script_080093DA:
-	_0807E914 0x00001d05
+	SetIntVariable 0x00001d05
 	CheckLocalFlag 0x00ad
 	JumpIf script_080093EE
-	_0807E914 0x00001d04
+	SetIntVariable 0x00001d04
 script_080093EE:
 	TextboxNoOverlapVar 
 	_0807EA94 
diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc
index 6ed41ece..1d6b8ba5 100644
--- a/data/scripts/script_080094FC.inc
+++ b/data/scripts/script_080094FC.inc
@@ -41,7 +41,7 @@ script_0800954E:
 	Call sub_08067314
 	_0807EF80 0x000a
 	_0807EB44 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_080672B0
 	EndBlock 
 script_08009592:
@@ -49,14 +49,14 @@ script_08009592:
 	JumpIfNot script_08009592
 	_0807E864 
 	_0807EB74 
-	_0807E914 0x00000004
+	SetIntVariable 0x00000004
 	Call sub_080672B0
 	Call sub_080672C8
 	_0807EA94 
 	Wait 0x000f
 	_0807E878 
 	_0807EB44 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_080672B0
 	Jump script_08009592
 	.short 0x0000
diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/script_08009ECC.inc
index 025d3bd5..da218f10 100644
--- a/data/scripts/script_08009ECC.inc
+++ b/data/scripts/script_08009ECC.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009ECC
 	BeginBlock 
-	_0807E914 0x00000002
+	SetIntVariable 0x00000002
 	_0807EF80 0x0001
 	EndBlock 
 	WaitForSomething2 0x00000004
 	BeginBlock 
-	_0807E914 0x00000003
+	SetIntVariable 0x00000003
 	_0807EF80 0x0001
 	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/script_08009EF0.inc
index 2af8003f..4e1b8076 100644
--- a/data/scripts/script_08009EF0.inc
+++ b/data/scripts/script_08009EF0.inc
@@ -1,11 +1,11 @@
 SCRIPT_START script_08009EF0
 	BeginBlock 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	_0807EF80 0x0001
 	EndBlock 
 	WaitForSomething2 0x00000004
 	BeginBlock 
-	_0807E914 0x00000001
+	SetIntVariable 0x00000001
 	_0807EF80 0x0001
 	EndBlock 
 SCRIPT_END
diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc
index d485f31e..e76ae5d9 100644
--- a/data/scripts/script_0800B3A4.inc
+++ b/data/scripts/script_0800B3A4.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_0800B3A4
 	SetEntityNonPlanarMovement 0x0120
 	_0807EB44 0x0004
 	_0807E908 0x0002
-	_0807E914 0x0000200a
+	SetIntVariable 0x0000200a
 	EndBlock 
 script_0800B3C4:
 	_0807EDD4 0x0158, 0x0290
diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc
index c52d06ce..0e57b91e 100644
--- a/data/scripts/script_0800C550.inc
+++ b/data/scripts/script_0800C550.inc
@@ -202,7 +202,7 @@ script_0800C7C0:
 	_0807EB8C 
 	TextboxNoOverlapFollow 0x1132
 	_0807EA94 
-	_0807E914 0x00000103
+	SetIntVariable 0x00000103
 	Call sub_0807F420
 	TextboxNoOverlapFollow 0x1133
 	_0807EA94 
@@ -250,7 +250,7 @@ script_0800C87C:
 	_0807E864 
 	Call sub_0807DF28
 	_0807EB74 
-	_0807E914 0x00000008
+	SetIntVariable 0x00000008
 	Call sub_0807F3D8
 	TextboxNoOverlapFollow 0x1136
 	_0807EA94 
diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc
index 4076c0d2..85678ca9 100644
--- a/data/scripts/script_0800CD7C.inc
+++ b/data/scripts/script_0800CD7C.inc
@@ -210,7 +210,7 @@ script_0800CFFA:
 	CheckInventory1 0x0002
 	JumpIfNot script_0800D032
 	_0807EB74 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	TextboxNoOverlap 0x1219
 	Jump script_0800D17C
@@ -220,14 +220,14 @@ script_0800D032:
 	StartPlayerScript script_0800D190
 	WaitForSomething2 0x00000008
 	_0807EB74 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	TextboxNoOverlapFollowPos 0x125c, 0x0002
 	_0807EA94 
 	StartPlayerScript script_0800D1B4
 	WaitForSomething2 0x00000008
 	_0807EB44 0x0002
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	Wait 0x000f
 	_0807E5F8 0x00000020
@@ -248,14 +248,14 @@ script_0800D0A8:
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000004
 	_0807EB74 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	TextboxNoOverlapFollowPos 0x123d, 0x0002
 	_0807EA94 
 	StartPlayerScript script_0800D1B4
 	WaitForSomething2 0x00000008
 	_0807EB44 0x0002
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	SoundReq 0x00cd
 	Call sub_08068964
diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc
index edd39c9c..ad48ee0b 100644
--- a/data/scripts/script_0800D278.inc
+++ b/data/scripts/script_0800D278.inc
@@ -59,7 +59,7 @@ script_0800D31E:
 	EndBlock 
 	_0807E864 
 	_0807EB74 
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806C028
 	TextboxNoOverlapFollow 0x1219
 	_0807EA94 
@@ -99,7 +99,7 @@ script_0800D3B2:
 	_0807EDD4 0x00a0, 0x0130
 	_0807EB44 0x0006
 	_0807E930 0x0003
-	_0807E914 0x00000004
+	SetIntVariable 0x00000004
 	Call sub_080681D8
 	SoundReq 0x00cd
 	Wait 0x001e
diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc
index 2af3e999..bb3fc93c 100644
--- a/data/scripts/script_0800D414.inc
+++ b/data/scripts/script_0800D414.inc
@@ -6,35 +6,35 @@ SCRIPT_START script_0800D414
 	EndBlock 
 script_0800D426:
 	_0807EB44 0x0002
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0006
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0006
-	_0807E914 0x00000004
+	SetIntVariable 0x00000004
 	Call sub_0806AF60
 	_0807EDD4 0x00a8, 0x01e8
 	_0807EB44 0x0006
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0002
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806AF60
 	Wait 0x0014
 	_0807EB44 0x0002
-	_0807E914 0x00000004
+	SetIntVariable 0x00000004
 	Call sub_0806AF60
 	_0807EDD4 0x0228, 0x01e8
 	Jump script_0800D426
diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc
index 44537ee1..cd34dd5b 100644
--- a/data/scripts/script_0800D874.inc
+++ b/data/scripts/script_0800D874.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800D874
 	BeginBlock 
 	Call sub_0807F934
 	_0807EF80 0x0008
-	_0807E914 0x00000001
+	SetIntVariable 0x00000001
 	Call sub_0806DA04
 	EndBlock 
 script_0800D88E:
@@ -45,7 +45,7 @@ script_0800D8F4:
 	_0807EB28 0x1325
 	_0807EA94 
 	SoundReq 0x0113
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806DA1C
 	_0807E878 
 	Call sub_0807DF50
diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc
index 3ba0cb1c..d258b15d 100644
--- a/data/scripts/script_0800D954.inc
+++ b/data/scripts/script_0800D954.inc
@@ -33,7 +33,7 @@ script_0800D962:
 	Wait 0x003c
 	SetLocalFlag 0x0032
 	SoundReq 0x0113
-	_0807E914 0x00000001
+	SetIntVariable 0x00000001
 	Call sub_0806DA1C
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc
index 79bb47dc..54f82101 100644
--- a/data/scripts/script_0800E5D6.inc
+++ b/data/scripts/script_0800E5D6.inc
@@ -6,7 +6,7 @@ script_0800E5D8:
 	JumpIfNot script_0800E5D8
 	_0807E864 
 	Wait 0x003c
-	_0807E914 0x00000905
+	SetIntVariable 0x00000905
 	Call sub_0807F420
 	SetRoomFlag 0x0001
 	Wait 0x001e
diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc
index d415dcea..d5a38e14 100644
--- a/data/scripts/script_0800EA54.inc
+++ b/data/scripts/script_0800EA54.inc
@@ -261,7 +261,7 @@ script_0800EDB6:
 	_0807E5F8 0x00000020
 	TextboxNoOverlapFollow 0x4c09
 	_0807EA94 
-	_0807E914 0x00000503
+	SetIntVariable 0x00000503
 	Call sub_0807F420
 	_0807E5F8 0x00000040
 	Call sub_0807DF50
@@ -311,7 +311,7 @@ script_0800EE76:
 	_0807E5F8 0x00000004
 	TextboxNoOverlapFollow 0x4c09
 	_0807EA94 
-	_0807E914 0x00000503
+	SetIntVariable 0x00000503
 	Call sub_0807F420
 	_0807E5F8 0x00000008
 	Call sub_0807DF50
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index 3f530de8..5df1fae4 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -152,11 +152,11 @@ script_0800F72C:
 	Call sub_0806DC3C
 	Call sub_080791BC
 	CallWithArg sub_0807F244, 0x0000000d
-	_0807E914 0x000000ff
+	SetIntVariable 0x000000ff
 	Call sub_0807F5B0
 	CallWithArg sub_0807F29C, 0x080049d6
 	Wait 0x00b7
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0807F5B0
 	TextboxNoOverlapFollowPos 0x102c, 0x0000
 	_0807EA94 
diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc
index b698a16d..2aa304fb 100644
--- a/data/scripts/script_08010264.inc
+++ b/data/scripts/script_08010264.inc
@@ -140,7 +140,7 @@ script_08010410:
 	_0807EB44 0x0004
 	_0807EF80 0x0000
 	_0807EF80 0x000a
-	_0807E914 0x08064689
+	SetIntVariable 0x08064689
 	Call sub_08064644
 	EndBlock 
 script_08010446:
@@ -316,7 +316,7 @@ script_08010686:
 	_0807EB74 
 	HasRoomItemForSale 
 	Call sub_0807F77C
-	_0807EAF0 0x3c08, 0x3c09
+	TextboxNoOverlapFollowTable 0x3c08, 0x3c09
 	_0807EA94 
 	_0807E878 
 	_0807EB44 0x0004
diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc
index db355ae8..4ae5828a 100644
--- a/data/scripts/script_0801232C.inc
+++ b/data/scripts/script_0801232C.inc
@@ -62,7 +62,7 @@ script_08012368:
 	SoundReq2 0xffff
 	_0807EB28 0x1403
 	_0807EA94 
-	_0807E914 0x00000203
+	SetIntVariable 0x00000203
 	Call sub_0807F420
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc
index 9be0127d..f11a59ef 100644
--- a/data/scripts/script_08012C68.inc
+++ b/data/scripts/script_08012C68.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_08012C68
 	BeginBlock 
 	_0807E9D4 
 	_0807EF80 0x0008
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_0806DA04
 	EndBlock 
 script_08012C7E:
diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc
index dd53dbc3..962663af 100644
--- a/data/scripts/script_08013114.inc
+++ b/data/scripts/script_08013114.inc
@@ -27,7 +27,7 @@ script_0801313C:
 	_0807E878 
 	Jump script_08013128
 script_08013176:
-	_0807E914 0x00000403
+	SetIntVariable 0x00000403
 	Call sub_0807F420
 	_0807E878 
 	Jump script_08013128
diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc
index 1d6fe9f3..1f682585 100644
--- a/data/scripts/script_080143C0.inc
+++ b/data/scripts/script_080143C0.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_080143C0
 	_0807EA94 
 	_0807E3E8 
 	JumpIf script_080143FA
-	_0807E914 0x00000002
+	SetIntVariable 0x00000002
 	Call sub_08065528
 	Jump script_0801443E
 script_080143FA:
@@ -19,13 +19,13 @@ script_080143FA:
 	TextboxNoOverlap 0x2c18
 	_0807EA94 
 	Wait 0x000a
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	Call sub_08065528
 	_0807F034 0x0036
 	WaitPlayerAction8 
 	TextboxNoOverlap 0x2c19
 	_0807EA94 
-	_0807E914 0x00000303
+	SetIntVariable 0x00000303
 	Call sub_0807F420
 	Wait 0x001e
 	_0807EB8C 
diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc
index bfa75dec..f19cefb0 100644
--- a/data/scripts/script_08014B34.inc
+++ b/data/scripts/script_08014B34.inc
@@ -58,7 +58,7 @@ script_08014BF2:
 	SetLocalFlag 0x0065
 	TextboxNoOverlap 0x2f07
 	_0807EA94 
-	_0807E914 0x00000064
+	SetIntVariable 0x00000064
 	_0807F034 0x003f
 	WaitPlayerAction8 
 	Jump script_08014C22
diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc
index 972de427..d6bc68aa 100644
--- a/data/scripts/script_080160A8.inc
+++ b/data/scripts/script_080160A8.inc
@@ -59,7 +59,7 @@ script_08016146:
 	JumpIfNot script_08016146
 	_0807E864 
 	GetInventoryValue 0x0025
-	_0807EAF0_4 0x2d03, 0x2d02, 0x2d02, 0x2d02
+	TextboxNoOverlapFollowTable_4 0x2d03, 0x2d02, 0x2d02, 0x2d02
 	_0807E3E8 
 	JumpIfNot script_0801618A
 	_0807E48C 0x0020
@@ -85,7 +85,7 @@ script_0801619A:
 	JumpIfNot script_0801619A
 	_0807E864 
 	GetInventoryValue 0x0024
-	_0807EAF0_4 0x2d05, 0x2d04, 0x2d04, 0x2d04
+	TextboxNoOverlapFollowTable_4 0x2d05, 0x2d04, 0x2d04, 0x2d04
 	_0807E3E8 
 	JumpIfNot script_080161E2
 	_0807E48C 0x0020
diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc
index cc13f1bf..b994262f 100644
--- a/data/scripts/script_08016482.inc
+++ b/data/scripts/script_08016482.inc
@@ -19,7 +19,7 @@ SCRIPT_START script_08016482
 	_0807E8E4_2 
 	_0807E8E4_3 
 	_0807E908 0x0004
-	_0807E914 0x00000000
+	SetIntVariable 0x00000000
 	_0807E924 
 	_0807E930 0x0000
 	_0807E944 
@@ -32,7 +32,7 @@ SCRIPT_START script_08016482
 	TextboxNoOverlapFollow 0x0601
 	TextboxNoOverlap 0x0601
 	TextboxNoOverlapFollowPos_1 0x0601
-	_0807EAF0_3 0x0601, 0x0602, 0x0603
+	TextboxNoOverlapFollowTable_3 0x0601, 0x0602, 0x0603
 	TextboxNoOverlapVar 
 	_0807EB28 0x0602
 	_0807EB38 
diff --git a/include/script.h b/include/script.h
index aebc64dd..b1aeca73 100644
--- a/include/script.h
+++ b/include/script.h
@@ -5,7 +5,7 @@
 
 typedef struct ScriptExecutionContext {
     u16* scriptInstructionPointer;
-    u32 unk_04;
+    u32 intVariable;
     u32 unk_08;
     u8 unk_0C[0x4]; // unused
     u16 wait;
diff --git a/src/npc/beedle.c b/src/npc/beedle.c
index 0e9a95ff..db962461 100644
--- a/src/npc/beedle.c
+++ b/src/npc/beedle.c
@@ -149,7 +149,7 @@ void sub_0806346C(Entity* this) {
 }
 
 void sub_080634E4(Entity* this, ScriptExecutionContext* context) {
-    context->unk_04 = this->type2;
+    context->intVariable = this->type2;
 }
 
 void sub_080634EC(Entity* this) {
diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c
index 1c6392e4..b49e67d9 100644
--- a/src/npc/carpenter.c
+++ b/src/npc/carpenter.c
@@ -70,5 +70,5 @@ void Carpenter_Head(Entity* this) {
 }
 
 void sub_080672B0(Entity* this, ScriptExecutionContext* context) {
-    InitializeAnimation(this, context->unk_04 + (this->animationState >> 1) + this->type * 8);
+    InitializeAnimation(this, context->intVariable + (this->animationState >> 1) + this->type * 8);
 }
diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c
index d4c59e30..ee4ef053 100644
--- a/src/npc/ezloCap.c
+++ b/src/npc/ezloCap.c
@@ -108,12 +108,12 @@ void NPC4E(Entity* this) {
 void sub_0806DA04(Entity* this, ScriptExecutionContext* context) {
     // TODO gUnk_0811415C should be a gUnk_0810C89C_struct[], but then a lot of bytes everywhere are wrong?
     gUnk_0810C89C_struct* a = (gUnk_0810C89C_struct*)&(
-        (gUnk_0810C89C_struct*)gUnk_0811415C)[context->unk_04]; // cast necessary to no longer make it a const* ?
+        (gUnk_0810C89C_struct*)gUnk_0811415C)[context->intVariable]; // cast necessary to no longer make it a const* ?
     sub_08078850(this, 1, a->unk_04, a);
 }
 
 void sub_0806DA1C(Entity* this, ScriptExecutionContext* context) {
-    sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->unk_04], (u32)(gUnk_081141E4[context->unk_04]));
+    sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->intVariable], (u32)(gUnk_081141E4[context->intVariable]));
 }
 
 // Returns the kinstone id?
diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c
index 5f1686c4..b846d29e 100644
--- a/src/npc/forestMinish.c
+++ b/src/npc/forestMinish.c
@@ -225,7 +225,7 @@ void sub_080602BC(Entity* this) {
 }
 
 void sub_0806030C(Entity* this, ScriptExecutionContext* context) {
-    ModBombs(context->unk_04);
+    ModBombs(context->intVariable);
 }
 
 void sub_08060318() {
diff --git a/src/npc/guard.c b/src/npc/guard.c
index 3a43c14c..1b3ba9b3 100644
--- a/src/npc/guard.c
+++ b/src/npc/guard.c
@@ -219,15 +219,15 @@ void sub_08064044() {
 }
 
 void sub_08064050(Entity* this, ScriptExecutionContext* context) {
-    context->unk_04 = 0;
+    context->intVariable = 0;
     switch (this->type2) {
         case 0x11:
-            context->unk_04 = 1;
+            context->intVariable = 1;
             break;
         case 0x12:
-            context->unk_04 = 2;
+            context->intVariable = 2;
             break;
         case 0x13:
-            context->unk_04 = 3;
+            context->intVariable = 3;
     }
 }
diff --git a/src/npc/simon.c b/src/npc/simon.c
index 2741f30a..c94ec167 100644
--- a/src/npc/simon.c
+++ b/src/npc/simon.c
@@ -45,7 +45,7 @@ void sub_0806C280() {
 }
 
 void sub_0806C2A0(Entity* this, ScriptExecutionContext* context) {
-    switch (context->unk_04) {
+    switch (context->intVariable) {
         case 0:
             DoFade(0xd, 4);
             break;
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index 1aeca5b2..ff96b1fb 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -224,7 +224,7 @@ void sub_0806AEE4(Entity* this) {
 }
 
 void sub_0806AF60(Entity* this, ScriptExecutionContext* context) {
-    InitializeAnimation(this, context->unk_04 + (this->animationState / 2));
+    InitializeAnimation(this, context->intVariable + (this->animationState / 2));
 }
 
 void sub_0806AF70(Entity* this, ScriptExecutionContext* context) {
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
index 9b097489..76fea004 100644
--- a/src/npc/townsperson.c
+++ b/src/npc/townsperson.c
@@ -257,7 +257,7 @@ void sub_08061FB0(Entity* this) {
 void sub_08061FB8(Entity* this, ScriptExecutionContext* context) {
     u8* temp = gUnk_0810B748;
 
-    sub_08078850(this, 1, temp[context->unk_04], &gUnk_0810B740[context->unk_04]);
+    sub_08078850(this, 1, temp[context->intVariable], &gUnk_0810B740[context->intVariable]);
 }
 
 void sub_08061FD8(Entity* this) {
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index c52456ab..e3005ea2 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -540,7 +540,7 @@ void sub_08087424(Entity* this, ScriptExecutionContext* context) {
         sub_0805E3A0(ent, 2);
     }
 
-    switch (context->unk_04) {
+    switch (context->intVariable) {
         case 0:
             gSave.stats.arrowCount = 0;
             break;
diff --git a/src/script.c b/src/script.c
index 7e316da8..1f8e583e 100644
--- a/src/script.c
+++ b/src/script.c
@@ -88,7 +88,7 @@ void ScriptCommand_StartPlayerScript(Entity* entity, ScriptExecutionContext* con
 void ScriptCommand_0807E8D4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E8E4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E908(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E914(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetIntVariable(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E924(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E930(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E944(Entity* entity, ScriptExecutionContext* context);
@@ -103,7 +103,7 @@ void ScriptCommand_0807EA94(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_TextboxNoOverlapFollow(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_TextboxNoOverlap(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_TextboxNoOverlapFollowPos(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_TextboxNoOverlapFollowTable(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_TextboxNoOverlapVar(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context);
@@ -235,7 +235,7 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
                                           ScriptCommand_0807E8E4,
                                           ScriptCommand_0807E8E4,
                                           ScriptCommand_0807E908,
-                                          ScriptCommand_0807E914,
+                                          ScriptCommand_SetIntVariable,
                                           ScriptCommand_0807E924,
                                           ScriptCommand_0807E930,
                                           ScriptCommand_0807E944,
@@ -250,7 +250,7 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
                                           ScriptCommand_TextboxNoOverlapFollow,
                                           ScriptCommand_TextboxNoOverlap,
                                           ScriptCommand_TextboxNoOverlapFollowPos,
-                                          ScriptCommand_0807EAF0,
+                                          ScriptCommand_TextboxNoOverlapFollowTable,
                                           ScriptCommand_TextboxNoOverlapVar,
                                           ScriptCommand_0807EB28,
                                           ScriptCommand_0807EB38,
@@ -658,8 +658,8 @@ void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void ScriptCommand_JumpTable(Entity* entity, ScriptExecutionContext* context) {
-    if (gActiveScriptInfo.commandSize > context->unk_04) {
-        context->scriptInstructionPointer += context->unk_04;
+    if (gActiveScriptInfo.commandSize > context->intVariable) {
+        context->scriptInstructionPointer += context->intVariable;
         ScriptCommand_Jump(entity, context);
     }
 }
@@ -683,8 +683,8 @@ void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* con
 }
 
 void ScriptCommand_JumpAbsoluteTable(Entity* entity, ScriptExecutionContext* context) {
-    if (gActiveScriptInfo.commandSize > (context->unk_04 << 1) + 1) {
-        context->scriptInstructionPointer += context->unk_04 << 1;
+    if (gActiveScriptInfo.commandSize > (context->intVariable << 1) + 1) {
+        context->scriptInstructionPointer += context->intVariable << 1;
         ScriptCommand_JumpAbsolute(entity, context);
     }
 }
@@ -693,10 +693,10 @@ void ScriptCommand_Call(Entity* entity, ScriptExecutionContext* context) {
     ((ScriptCommand)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer))(entity, context);
 }
 
-// the called function can read an argument from context->unk_04
+// the called function can read an argument from context->intVariable
 void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context) {
     ScriptCommand tmp = (ScriptCommand)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
-    context->unk_04 = GetNextScriptCommandWord(context->scriptInstructionPointer + 3);
+    context->intVariable = GetNextScriptCommandWord(context->scriptInstructionPointer + 3);
     tmp(entity, context);
 }
 
@@ -863,19 +863,19 @@ void ScriptCommand_HasRoomItemForSale(Entity* entity, ScriptExecutionContext* co
 }
 
 void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context) {
-    context->condition = !!(context->unk_04 & context->scriptInstructionPointer[1]);
+    context->condition = !!(context->intVariable & context->scriptInstructionPointer[1]);
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = context->scriptInstructionPointer[1];
-    context->condition = tmp == (tmp & context->unk_04);
+    context->condition = tmp == (tmp & context->intVariable);
     gActiveScriptInfo.flags |= 1;
 }
 
 void ScriptCommand_0807E514(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = context->scriptInstructionPointer[1];
-    context->condition = tmp == context->unk_04;
+    context->condition = tmp == context->intVariable;
     gActiveScriptInfo.flags |= 1;
 }
 
@@ -1088,12 +1088,12 @@ void ScriptCommand_0807E908(Entity* entity, ScriptExecutionContext* context) {
     entity->previousActionFlag = 0;
 }
 
-void ScriptCommand_0807E914(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_04 = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
+void ScriptCommand_SetIntVariable(Entity* entity, ScriptExecutionContext* context) {
+    context->intVariable = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
 }
 
 void ScriptCommand_0807E924(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_04 = entity->frames.all;
+    context->intVariable = entity->frames.all;
     entity->frames.all = 0;
 }
 
@@ -1205,9 +1205,9 @@ void ScriptCommand_TextboxNoOverlapFollowPos(Entity* entity, ScriptExecutionCont
     gTextBox.textWindowPosY = context->scriptInstructionPointer[2];
 }
 
-void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context) {
-    if (gActiveScriptInfo.commandSize > context->unk_04) {
-        u16* tmp = context->scriptInstructionPointer + context->unk_04;
+void ScriptCommand_TextboxNoOverlapFollowTable(Entity* entity, ScriptExecutionContext* context) {
+    if (gActiveScriptInfo.commandSize > context->intVariable) {
+        u16* tmp = context->scriptInstructionPointer + context->intVariable;
         TextboxNoOverlapFollow(tmp[1]);
     } else {
         TextboxNoOverlapFollow(0);
@@ -1215,7 +1215,7 @@ void ScriptCommand_0807EAF0(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void ScriptCommand_TextboxNoOverlapVar(Entity* entity, ScriptExecutionContext* context) {
-    TextboxNoOverlap(context->unk_04, entity);
+    TextboxNoOverlap(context->intVariable, entity);
 }
 
 void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context) {
@@ -1223,7 +1223,7 @@ void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_04 = gUnk_02000040.unk_01;
+    context->intVariable = gUnk_02000040.unk_01;
 }
 
 void ScriptCommand_0807EB44(Entity* entity, ScriptExecutionContext* context) {
@@ -1483,7 +1483,7 @@ void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* con
 void ScriptCommand_0807F034(Entity* entity, ScriptExecutionContext* context) {
     u32 tmp = 0;
     if (context->scriptInstructionPointer[1] == 0x3F) {
-        tmp = context->unk_04;
+        tmp = context->intVariable;
     }
     sub_080A7C18(context->scriptInstructionPointer[1], tmp, 0);
 }
@@ -1493,8 +1493,8 @@ void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void ScriptCommand_GetInventoryValue(Entity* entity, ScriptExecutionContext* context) {
-    context->unk_04 = GetInventoryValue(context->scriptInstructionPointer[1]);
-    context->condition = context->unk_04 != 0;
+    context->intVariable = GetInventoryValue(context->scriptInstructionPointer[1]);
+    context->condition = context->intVariable != 0;
 }
 
 void ScriptCommand_0807F078(Entity* entity, ScriptExecutionContext* context) {
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py
index 1a2e91d0..9bb1424b 100644
--- a/tools/script_disassembler/definitions.py
+++ b/tools/script_disassembler/definitions.py
@@ -85,7 +85,7 @@ commands = [
     {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''},  # duplicate
     {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''},  # duplicate
     {'fun': 'ScriptCommand_0807E908', 'params': 's'},
-    {'fun': 'ScriptCommand_0807E914', 'params': 'w'},
+    {'fun': 'ScriptCommandSetIntVariable', 'params': 'w'},
     {'fun': 'ScriptCommand_0807E924', 'params': ''},
     {'fun': 'ScriptCommand_0807E930', 'params': 's'},
     {'fun': 'ScriptCommand_0807E944', 'params': ''},
@@ -100,7 +100,7 @@ commands = [
     {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'},
     {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'},
     {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['ss', 's']},
-    {'fun': 'ScriptCommand_0807EAF0', 'params': ['ss', 'sss', 'ssss']},
+    {'fun': 'ScriptCommandTextboxNoOverlapFollowTable', 'params': ['ss', 'sss', 'ssss']},
     {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''},
     {'fun': 'ScriptCommand_0807EB28', 'params': 's'},
     {'fun': 'ScriptCommand_0807EB38', 'params': ''},