header overhaul

asm/code_0801967C.s

@@ -939,7 +939,7 @@ _08019D76:
 _08019D8C: .4byte gPlayerState
 _08019D90: .4byte gUnk_0200AF00
 _08019D94:
-	bl sub_08052734
+	bl HasDungeonMap
 	cmp r0, #0
 	bne _08019D9E
 	b _0801A2A4

asm/code_0801D79C.s

@@ -466,7 +466,7 @@ _0801DC04:
 	adds r0, r6, #0
 	bl sub_0801DF10
 	mov r8, r0
-	bl sub_0805279C
+	bl HasDungeonBigKey
 	movs r1, #8
 	adds r1, r1, r6
 	mov sb, r1
@@ -548,7 +548,7 @@ _0801DCA6:
 	cmp r0, #0
 	bne _0801DC26
 _0801DCAE:
-	bl sub_0805279C
+	bl HasDungeonBigKey
 	cmp r0, #0
 	beq _0801DD16
 	ldrb r1, [r6, #2]
@@ -731,7 +731,7 @@ _0801DDE4:
 _0801DE14: .4byte gUnk_02032EC0
 _0801DE18: .4byte 0x0000FFFF
 _0801DE1C:
-	bl sub_080527CC
+	bl HasDungeonSmallKey
 	cmp r0, #0
 	beq _0801DE28
 	movs r0, #2

asm/code_08077B98.s

@@ -741,13 +741,13 @@ _080785B0:
 	ands r0, r1
 	cmp r0, #0
 	bne _080785F0
-	bl sub_08052734
+	bl HasDungeonMap
 	cmp r0, #0
 	beq _080785C4
 	movs r0, #1
 _080785C4:
 	adds r7, r0, #0
-	bl sub_08052764
+	bl HasDungeonCompass
 	cmp r0, #0
 	beq _080785D2
 	movs r0, #2

asm/code_080A5574.s

@@ -1344,7 +1344,7 @@ _080A558C:
 	movs r0, #0x87
 	lsls r0, r0, #7
 	strh r0, [r5, #8]
-	bl sub_080527CC
+	bl HasDungeonSmallKey
 	cmp r0, #0
 	beq _080A55BE
 	movs r0, #0x18
@@ -1359,7 +1359,7 @@ _080A558C:
 	adds r1, r4, #0
 	bl sub_080ADA14
 _080A55BE:
-	bl sub_08052764
+	bl HasDungeonCompass
 	cmp r0, #0
 	beq _080A55DE
 	movs r0, #0x2e
@@ -1374,7 +1374,7 @@ _080A55BE:
 	adds r1, r4, #0
 	bl sub_080ADA14
 _080A55DE:
-	bl sub_0805279C
+	bl HasDungeonBigKey
 	cmp r0, #0
 	beq _080A563CEU
 	movs r0, #0x45
@@ -1600,7 +1600,7 @@ _080A5D9A:
 	movs r0, #0x87
 	lsls r0, r0, #7
 	strh r0, [r5, #8]
-	bl sub_080527CC
+	bl HasDungeonSmallKey
 	cmp r0, #0
 	beq _080A5DCC
 	movs r0, #0x18
@@ -1616,7 +1616,7 @@ _080A5D9A:
 	adds r1, r4, #0
 	bl sub_080ADA14
 _080A5DCC:
-	bl sub_08052764
+	bl HasDungeonCompass
 	cmp r0, #0
 	beq _080A5DEE
 	movs r0, #0x2e
@@ -1632,7 +1632,7 @@ _080A5DCC:
 	adds r1, r4, #0
 	bl sub_080ADA14
 _080A5DEE:
-	bl sub_0805279C
+	bl HasDungeonBigKey
 	cmp r0, #0
 	beq _080A5E48
 	movs r0, #0x45

asm/fileScreen.s

@@ -974,7 +974,7 @@ HandleGameOverScreen: @ 0x08052094
 	cmp r0, #0
 	beq _080520B8
 	bl FlushSprites
-	bl sub_080523D4
+	bl DrawGameOverText
 	bl sub_080AD918
 _080520B8:
 	pop {r4, pc}

asm/non_matching/sub_08077F24.inc

@@ -1,11 +1,4 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
 	.syntax unified
-
-	.text
-
 	push {lr}
 	ldr r2, _08077F34 @ =gStats
 	ldrb r3, [r0, #1]