Fix merge conflicts

home/map.asm

@@ -1957,7 +1957,7 @@ CheckStandingOnXYTrigger:: ; 2ae7
 FadeToMenu:: ; 2b29
 	xor a
 	ld [hBGMapMode], a
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	callba FadeBlackBGMap
 	call ClearSprites
 	call DisableSpriteUpdates
@@ -1969,14 +1969,14 @@ Function2b3c:: ; 2b3c
 	call WhiteBGMap
 	call Function2bae
 	call UpdateSprites
-	call Function1d7d
+	call Call_ExitMenu
 	call Functiond90
 	jr Function2b5c
 ; 2b4d
 
 Function2b4d:: ; 2b4d
 	call WhiteBGMap
-	call Function1d7d
+	call Call_ExitMenu
 	call Function2bae
 	call UpdateSprites
 	call Functiond90

home/menu.asm

@@ -52,7 +52,7 @@ MenuTextBoxBackup:: ; 1d67
 	ret
 ; 1d6e
 
-Function1d6e:: ; 1d6e
+LoadMenuDataHeader_0x1d75:: ; 1d6e
 	ld hl, MenuDataHeader_0x1d75
 	call LoadMenuDataHeader
 	ret
@@ -66,7 +66,7 @@ MenuDataHeader_0x1d75:: ; 1d75
 	db 1 ; default option
 ; 1d7d
 
-Function1d7d:: ; 1d7d
+Call_ExitMenu:: ; 1d7d
 	call ExitMenu
 	ret
 ; 1d81

home/serial.asm

@@ -273,15 +273,15 @@ Function83b:: ; 83b
 ; 862
 
 Function862:: ; 862
-	call Function309d
+	call LoadTileMapToTempTileMap
 	callab Function4000
 	call Function87d
-	jp Function30b4
+	jp Call_LoadTempTileMapToTileMap
 ; 871
 
 
 Function871:: ; 871
-	call Function309d
+	call LoadTileMapToTempTileMap
 	callab Function4000
 	jp Function87d
 ; 87d