1 files changed, 24 insertions, 24 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s
index ddf9d4f7a..a4ce907f5 100755
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -683,7 +683,7 @@ _081C77B0:
 	movs r0, 0
 	bl sub_81C763C
 	adds r4, r0, 0
-	ldr r1, =gUnknown_08DC7B80
+	ldr r1, =gPokenavHeader_Gfx
 	movs r0, 0
 	str r0, [sp]
 	movs r2, 0
@@ -693,12 +693,12 @@ _081C77B0:
 	movs r0, 0
 	adds r1, r4, 0
 	bl SetBgTilemapBuffer
-	ldr r1, =gUnknown_08DC7D84
+	ldr r1, =gPokenavHeader_Tilemap
 	movs r0, 0
 	movs r2, 0
 	movs r3, 0
 	bl CopyToBgTilemapBuffer
-	ldr r0, =gUnknown_08DC7B60
+	ldr r0, =gPokenavHeader_Pal
 	movs r1, 0
 	movs r2, 0x20
 	bl sub_81C7944
@@ -1571,7 +1571,7 @@ sub_81C7E58: @ 81C7E58
 	bl sub_8034974
 	adds r5, r0, 0
 	lsls r4, 5
-	ldr r0, =gUnknown_08DC7F00
+	ldr r0, =gPokenavLeftHeader_Pal
 	adds r4, r0
 	movs r0, 0x1
 	bl IndexOfSpritePaletteTag
@@ -1653,7 +1653,7 @@ sub_81C7F24: @ 81C7F24
 	bl sub_8034974
 	adds r5, r0, 0
 	lsls r4, 5
-	ldr r0, =gUnknown_08DC7F00
+	ldr r0, =gPokenavLeftHeader_Pal
 	adds r4, r0
 	movs r0, 0x2
 	bl IndexOfSpritePaletteTag
@@ -5198,7 +5198,7 @@ _081C9A5C:
 	ldr r0, =gUnknown_08620194
 	movs r1, 0x3
 	bl sub_81C7B54
-	ldr r1, =gUnknown_08DC90E0
+	ldr r1, =gPokenavMessageBox_Gfx
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x1
@@ -5209,14 +5209,14 @@ _081C9A5C:
 	adds r1, 0x8C
 	movs r0, 0x1
 	bl SetBgTilemapBuffer
-	ldr r1, =gUnknown_08DC9130
+	ldr r1, =gPokenavMessageBox_Tilemap
 	movs r0, 0x1
 	movs r2, 0
 	movs r3, 0
 	bl CopyToBgTilemapBuffer
 	movs r0, 0x1
 	bl CopyBgTilemapBufferToVram
-	ldr r0, =gUnknown_08DC90C0
+	ldr r0, =gPokenavMessageBox_Pal
 	movs r1, 0x10
 	movs r2, 0x20
 	bl sub_81C7944
@@ -7924,7 +7924,7 @@ sub_81CAF78: @ 81CAF78
 	strb r0, [r6]
 	ldr r0, =gMapHeader
 	ldrb r0, [r0, 0x17]
-	bl is_light_level_1_2_3_or_6
+	bl Overworld_MapTypeAllowsTeleportAndFly
 	lsls r0, 24
 	cmp r0, 0
 	bne _081CAFA4
@@ -8089,7 +8089,7 @@ _081CB0C0:
 	thumb_func_start sub_81CB0C8
 sub_81CB0C8: @ 81CB0C8
 	push {lr}
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, 4
 	adds r0, r1
 	ldrh r2, [r0, 0xA]
@@ -11374,7 +11374,7 @@ sub_81CCA1C: @ 81CCA1C
 	movs r1, 0x10
 	movs r2, 0x20
 	bl sub_81C7944
-	ldr r0, =gUnknown_08DC91E8
+	ldr r0, =gHoennMapZoomIcons_Pal
 	movs r1, 0x30
 	movs r2, 0x20
 	bl sub_81C7944
@@ -11813,7 +11813,7 @@ _081CCE34:
 	mov r1, r8
 	lsrs r0, r1, 24
 	lsrs r1, r7, 24
-	bl sub_8145CF4
+	bl GetLandmarkName
 	adds r1, r0, 0
 	cmp r1, 0
 	bne _081CCE08
@@ -13941,7 +13941,7 @@ _081CDF18:
 	ldr r1, =0x0000040b
 	movs r0, 0x52
 	bl SetGpuReg
-	ldr r1, =gUnknown_08DC6548
+	ldr r1, =gPokenavCondition_Gfx
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x3
@@ -13973,7 +13973,7 @@ _081CDFB8:
 	beq _081CDFC4
 	b _081CE2C0
 _081CDFC4:
-	ldr r0, =gUnknown_08DC6DFC
+	ldr r0, =gPokenavCondition_Tilemap
 	adds r4, r5, 0x4
 	adds r1, r4, 0
 	bl LZ77UnCompVram
@@ -13983,7 +13983,7 @@ _081CDFC4:
 	bl sub_81CDD5C
 	cmp r0, 0x1
 	bne _081CDFF2
-	ldr r1, =gUnknown_08DC7070
+	ldr r1, =gPokenavOptions_Tilemap
 	movs r0, 0x9
 	str r0, [sp]
 	movs r0, 0x4
@@ -13995,7 +13995,7 @@ _081CDFC4:
 _081CDFF2:
 	movs r0, 0x3
 	bl CopyBgTilemapBufferToVram
-	ldr r0, =gUnknown_08DC6528
+	ldr r0, =gPokenavCondition_Pal
 	movs r1, 0x10
 	movs r2, 0x20
 	bl sub_81C7944
@@ -20738,7 +20738,7 @@ _081D15B6:
 
 	thumb_func_start sub_81D15BC
 sub_81D15BC: @ 81D15BC
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, 4
 	adds r0, r1
 	ldrh r0, [r0]
@@ -20751,7 +20751,7 @@ sub_81D15CC: @ 81D15CC
 	push {lr}
 	adds r3, r0, 0
 	movs r1, 0
-	ldr r2, =gUnknown_085500A4
+	ldr r2, =gRematchTable
 _081D15D4:
 	ldrh r0, [r2]
 	cmp r0, r3
@@ -21440,7 +21440,7 @@ _081D1A24:
 	cmp r0, 0
 	bne _081D1A1C
 	adds r0, r7, 0
-	bl sub_80B2318
+	bl CountBattledRematchTeams
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0x1
@@ -21921,7 +21921,7 @@ sub_81D1DC0: @ 81D1DC0
 	ldr r7, =gUnknown_0203CF4C
 	ldr r0, =gText_Cancel2
 	mov r12, r0
-	ldr r4, =gUnknown_03006310
+	ldr r4, =gMultiuseListMenuTemplate
 	ldr r1, =gUnknown_0203CF48
 	mov r8, r1
 	ldr r2, =sub_81D1E7C
@@ -23376,7 +23376,7 @@ sub_81D28C8: @ 81D28C8
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r4, r1, 16
-	ldr r3, =gUnknown_03006310
+	ldr r3, =gMultiuseListMenuTemplate
 	adds r2, r3, 0
 	ldr r1, =gUnknown_08625548
 	ldm r1!, {r5-r7}
@@ -30343,8 +30343,8 @@ _081D6176:
 	.pool
 	thumb_func_end sub_81D6134
 
-	thumb_func_start battle_init
-battle_init: @ 81D6180
+	thumb_func_start sub_81D6180
+sub_81D6180: @ 81D6180
 	lsls r0, 24
 	ldr r1, =gSaveBlock2Ptr
 	ldr r1, [r1]
@@ -30355,7 +30355,7 @@ battle_init: @ 81D6180
 	ldrh r0, [r1]
 	bx lr
 	.pool
-	thumb_func_end battle_init
+	thumb_func_end sub_81D6180
 
 	thumb_func_start GetTrainerHillTrainerFlag
 @ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId)