Merge commit '66ef1838' into merge-mrwint

Conflicts: home/map.asm
2013-10-25 17:53:16 -04:00 · 2013-10-25 17:53:16 -04:00 · 9e81c46cbf
parent 933634d913 66ef183847
commit 9e81c46cbf
2 changed files with 2 additions and 2 deletions
--- 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
--- 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