ref: 9e81c46cbfa09805eb5503ee6e32b3d4a9eeb6a0
parent: 933634d913da01c2c0ef8e582df61128646bfe77
parent: 66ef18384779629d3653892c0cfa821ced6ad3c5
author: yenatch <[email protected]>
date: Fri Oct 25 13:53:16 EDT 2013
Merge commit '66ef1838' into merge-mrwint Conflicts: home/map.asm
--- a/home/map.asm
+++ b/home/map.asm
@@ -1416,7 +1416,7 @@
jr .asm_2875
.asm_286f
- callba Function1c000
+ callba LoadMapGroupRoof
.asm_2875
xor a
--- a/main.asm
+++ b/main.asm
@@ -31138,7 +31138,7 @@
SECTION "bank7",ROMX,BANK[$7]
-Function1c000: ; 1c000
+LoadMapGroupRoof: ; 1c000
ld a, [MapGroup]
ld e, a
ld d, 0