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 /home/map.asm | |
| parent | 933634d913da01c2c0ef8e582df61128646bfe77 (diff) | |
| parent | 66ef18384779629d3653892c0cfa821ced6ad3c5 (diff) | |
Merge commit '66ef1838' into merge-mrwint
Conflicts:
home/map.asm
Diffstat (limited to 'home/map.asm')
| -rw-r--r-- | home/map.asm | 2 |
1 files changed, 1 insertions, 1 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 |