Merge branch 'master' into field_map_obj

asm/link.s

@@ -1232,7 +1232,7 @@ _08009E8C:
 _08009EA8:
 	ldr r0, =gUnknown_03003110
 	strh r2, [r0]
-	ldr r1, =gUnknown_0203CE7C
+	ldr r1, =gScriptItemId
 	ldrh r1, [r1]
 	b _08009F04
 	.pool
@@ -21076,7 +21076,7 @@ sub_8014210: @ 8014210
 	str r0, [r1, 0x8]
 	ldr r0, =gBattleTypeFlags
 	str r6, [r0]
-	bl sub_806E64C
+	bl PlayBattleBGM
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -45605,7 +45605,7 @@ _08020D74:
 sub_8020D8C: @ 8020D8C
 	push {r4,lr}
 	sub sp, 0xC
-	ldr r1, =gUnknown_0203CE7C
+	ldr r1, =gScriptItemId
 	ldrh r0, [r1]
 	subs r0, 0x85
 	lsls r0, 16
@@ -45626,7 +45626,7 @@ _08020DB0:
 	ldrb r0, [r2, 0x8]
 	lsls r0, 5
 	adds r0, r2, r0
-	ldr r1, =gUnknown_0203CE7C
+	ldr r1, =gScriptItemId
 	ldrh r1, [r1]
 	subs r1, 0x85
 	adds r0, 0xA4