Merge branch 'master' into demo-jp

asm/code_0801D79C.s

@@ -2299,14 +2299,14 @@ _0801E8BC:
 	bl sub_0801E810
 	cmp r0, #0
 	bne _0801E93A
-	ldr r1, _0801E8F4 @ =0x080C9A5C
+	ldr r1, _0801E8F4 @ =gUnk_080FC3E4
 	lsls r0, r4, #3
 	adds r0, r0, r1
 	ldrb r1, [r0, #4]
 	lsls r0, r1, #2
 	adds r0, r0, r1
 	lsls r0, r0, #2
-	ldr r1, _0801E8F8 @ =0x080FDFD0
+	ldr r1, _0801E8F8 @ =gUnk_080FE320
 	adds r2, r0, r1
 	ldrb r0, [r2, #0x10]
 	cmp r0, #4
@@ -2317,8 +2317,8 @@ _0801E8BC:
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_0801E8F4: .4byte 0x080C9A5C
-_0801E8F8: .4byte 0x080FDFD0
+_0801E8F4: .4byte gUnk_080C9CBC
+_0801E8F8: .4byte gUnk_080FE320
 _0801E8FC: .4byte _0801E900
 _0801E900: @ jump table
 	.4byte _0801E914 @ case 0

asm/code_080A3BD0.s

@@ -3201,7 +3201,7 @@ sub_080A529C: @ 0x080A529C
 	str r0, [r1, #0xc]
 	ldrb r4, [r1, #3]
 	lsls r1, r4, #3
-	ldr r0, _080A52D8 @ =gUnk_08128B64
+	ldr r0, _080A52D8 @ =gItemMenuTable
 	adds r1, r1, r0
 	ldr r0, _080A52DC @ =gInput
 	ldrh r2, [r0, #2]
@@ -3219,7 +3219,7 @@ sub_080A529C: @ 0x080A529C
 	.align 2, 0
 _080A52D0: .4byte gMenu
 _080A52D4: .4byte gUnk_08128BF4
-_080A52D8: .4byte gUnk_08128B64
+_080A52D8: .4byte gItemMenuTable
 _080A52DC: .4byte gInput
 _080A52E0:
 	cmp r4, #0x10
@@ -3358,7 +3358,7 @@ _080A4BC8:
 	ldrb r0, [r2]
 	cmp r0, #0
 	beq _080A4C68
-	ldr r0, _080A4C20 @ =gUnk_08128B64
+	ldr r0, _080A4C20 @ =gItemMenuTable
 	adds r1, r6, r0
 	ldrb r0, [r1, #6]
 	ldr r3, _080A4C14EU @ =gOamCmd
@@ -3395,7 +3395,7 @@ _080A4BF4:
 _080A4C14EU: .4byte gOamCmd
 _080A4C18: .4byte gSave
 _080A4C1C: .4byte gChooseFileState
-_080A4C20: .4byte gUnk_08128B64
+_080A4C20: .4byte gItemMenuTable
 _080A4C24: .4byte gBombBagSizes
 _080A4C28:
 	cmp r3, #0xa
@@ -3453,7 +3453,7 @@ _080A4C68:
 	movs r1, #0x11
 _080A4C8E:
 	lsls r0, r1, #3
-	ldr r1, _080A4D54EU @ =gUnk_08128B64
+	ldr r1, _080A4D54EU @ =gItemMenuTable
 	mov r8, r1
 	adds r1, r0, r1
 	mov r4, sb
@@ -3545,7 +3545,7 @@ _080A4D44: .4byte gOamCmd
 _080A4D48: .4byte gUnk_080FDFD8
 _080A4D4C: .4byte 0x00000141
 _080A4D50EU: .4byte gChooseFileState
-_080A4D54EU: .4byte gUnk_08128B64
+_080A4D54EU: .4byte gItemMenuTable
 _080A4D58: .4byte gMain
 _080A4D5C: .4byte gSave
 .else
@@ -3580,7 +3580,7 @@ _080A53B4:
 	ldrb r0, [r2]
 	cmp r0, #0
 	beq _080A5456
-	ldr r0, _080A540C @ =gUnk_08128B64
+	ldr r0, _080A540C @ =gItemMenuTable
 	adds r1, r6, r0
 	ldrb r0, [r1, #6]
 	ldr r3, _080A5400 @ =gOamCmd
@@ -3617,7 +3617,7 @@ _080A53E0:
 _080A5400: .4byte gOamCmd
 _080A5404: .4byte gSave
 _080A5408: .4byte gMenu
-_080A540C: .4byte gUnk_08128B64
+_080A540C: .4byte gItemMenuTable
 _080A5410: .4byte gBombBagSizes
 _080A5414:
 	cmp r3, #0xa
@@ -3676,7 +3676,7 @@ _080A5456:
 	movs r1, #0x11
 _080A547C:
 	lsls r0, r1, #3
-	ldr r1, _080A553C @ =gUnk_08128B64
+	ldr r1, _080A553C @ =gItemMenuTable
 	mov r8, r1
 	adds r1, r0, r1
 	mov r4, sb
@@ -3766,7 +3766,7 @@ _080A552C: .4byte gQuiverSizes
 _080A5530: .4byte gOamCmd
 _080A5534: .4byte gUnk_080FDFD8
 _080A5538: .4byte gMenu
-_080A553C: .4byte gUnk_08128B64
+_080A553C: .4byte gItemMenuTable
 _080A5540: .4byte gMain
 _080A5544: .4byte 0x000001FB
 _080A5548: .4byte gSave

asm/figurineDevice.s

@@ -1102,7 +1102,7 @@ sub_08088160: @ 0x08088160
 	push {r4, lr}
 	adds r2, r0, #0
 	lsls r1, r1, #3
-	ldr r0, _08087FB0 @ =0x080FC094
+	ldr r0, _08087FB0 @ =gUnk_080FC3E4
 	adds r1, r1, r0
 	movs r4, #0
 	adds r0, r2, #0
@@ -1120,7 +1120,7 @@ sub_08088160: @ 0x08088160
 	beq _08087FBC
 	b _0808806A
 	.align 2, 0
-_08087FB0: .4byte 0x080FC094
+_08087FB0: .4byte gUnk_080FC3E4
 _08087FB4:
 	cmp r0, #0x20
 	beq _08087FCA

asm/windTribeTeleporter.s

@@ -316,12 +316,12 @@ _080A0E50:
 	lsls r0, r1, #2
 	adds r0, r0, r1
 	lsls r0, r0, #2
-	ldr r1, _080A0E70 @ =0x0813AA18
+	ldr r1, _080A0E70 @ =gUnk_0813ADEC
 	adds r0, r0, r1
 	bl DoExitTransition
 	b _080A0E8C
 	.align 2, 0
-_080A0E70: .4byte 0x0813AA18
+_080A0E70: .4byte gUnk_0813ADEC
 _080A0E74:
 	ldr r0, _080A0E90 @ =0x030010A0
 	ldr r0, [r0]