Merge commit '66ef1838' into merge-mrwint

Conflicts:
	home/map.asm
This commit is contained in:
yenatch
2013-10-25 17:53:16 -04:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1416,7 +1416,7 @@ Function2821: ; 2821
jr .asm_2875
.asm_286f
callba Function1c000
callba LoadMapGroupRoof
.asm_2875
xor a