diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-25 17:53:16 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-25 17:53:16 -0400 |
| commit | 9e81c46cbfa09805eb5503ee6e32b3d4a9eeb6a0 (patch) | |
| tree | 562aabe47275139a3108b9abd73c928e669ff2e5 /main.asm | |
| parent | 933634d913da01c2c0ef8e582df61128646bfe77 (diff) | |
| parent | 66ef18384779629d3653892c0cfa821ced6ad3c5 (diff) | |
Merge commit '66ef1838' into merge-mrwint
Conflicts:
home/map.asm
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |