Merge branch 'master' into cleanup_declarations

asm/code_080732D0.s

@@ -3501,7 +3501,7 @@ sub_08074CF8: @ 0x08074CF8
 	adds r4, r5, #0
 	adds r4, #0x84
 	ldr r1, [r4]
-	bl ExecuteScriptCommandSet
+	bl ExecuteScript
 	ldr r1, [r4]
 	adds r0, r5, #0
 	bl sub_08074D34
@@ -3818,7 +3818,7 @@ sub_08074F2C: @ 0x08074F2C
 	adds r5, r4, #0
 	adds r5, #0x84
 	ldr r1, [r5]
-	bl ExecuteScriptCommandSet
+	bl ExecuteScript
 	ldr r1, [r5]
 	adds r0, r4, #0
 	bl sub_08074D34
@@ -3874,7 +3874,7 @@ sub_08074F8C: @ 0x08074F8C
 	bne _08074FAC
 	movs r0, #0
 	strb r0, [r3]
-	ldr r2, _08074FDC @ =gUnk_02033280
+	ldr r2, _08074FDC @ =gActiveScriptInfo
 	ldr r0, [r2]
 	movs r1, #4
 	orrs r0, r1
@@ -3904,7 +3904,7 @@ _08074FAC:
 	lsls r0, r0, #3
 	b _08074FE8
 	.align 2, 0
-_08074FDC: .4byte gUnk_02033280
+_08074FDC: .4byte gActiveScriptInfo
 _08074FE0: .4byte gPlayerState
 _08074FE4:
 	movs r0, #0x80
@@ -4223,16 +4223,16 @@ sub_080751E8: @ 0x080751E8
 	cmp r7, #0
 	bne _08075240
 	strb r7, [r3]
-	ldr r6, _0807523C @ =gUnk_08009ECC
+	ldr r6, _0807523C @ =script_08009ECC
 	b _08075244
 	.align 2, 0
 _08075230: .4byte gPlayerScriptExecutionContext
 _08075234: .4byte gPlayerEntity
 _08075238: .4byte gPlayerState
-_0807523C: .4byte gUnk_08009ECC
+_0807523C: .4byte script_08009ECC
 _08075240:
 	strb r4, [r3]
-	ldr r6, _08075290 @ =gUnk_08009EF0
+	ldr r6, _08075290 @ =script_08009EF0
 _08075244:
 	ldr r0, _08075294 @ =gPlayerState
 	adds r0, #0x39
@@ -4270,7 +4270,7 @@ _08075270:
 _0807528C:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_08075290: .4byte gUnk_08009EF0
+_08075290: .4byte script_08009EF0
 _08075294: .4byte gPlayerState
 _08075298: .4byte gPlayerEntity
 
@@ -4310,13 +4310,13 @@ _080752D0:
 	cmp r0, #0
 	beq _080752E2
 _080752DC:
-	ldr r1, _080752E4 @ =gUnk_02033280
+	ldr r1, _080752E4 @ =gActiveScriptInfo
 	movs r0, #0
 	strb r0, [r1, #6]
 _080752E2:
 	pop {r4, r5, pc}
 	.align 2, 0
-_080752E4: .4byte gUnk_02033280
+_080752E4: .4byte gActiveScriptInfo
 
 	thumb_func_start sub_080752E8
 sub_080752E8: @ 0x080752E8