Merge commit '66ef1838' into merge-mrwint

Conflicts:
	home/map.asm

2 files changed, 2 insertions, 2 deletions

diff --git a/home/map.asm b/home/map.asm
index ade44a4a2..fffd08273 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -1416,7 +1416,7 @@ Function2821: ; 2821
 	jr .asm_2875
 
 .asm_286f
-	callba Function1c000
+	callba LoadMapGroupRoof
 
 .asm_2875
 	xor a
diff --git a/main.asm b/main.asm
index 271b6adce..8ce52e9cf 100644
--- a/main.asm
+++ b/main.asm
@@ -31138,7 +31138,7 @@ INCLUDE "tilesets/data_1.asm"
 
 SECTION "bank7",ROMX,BANK[$7]
 
-Function1c000: ; 1c000
+LoadMapGroupRoof: ; 1c000
 	ld a, [MapGroup]
 	ld e, a
 	ld d, 0