Merge yenatch:map-objects

This commit is contained in:
PikalaxALT
2015-07-25 20:18:59 -04:00
85 changed files with 423 additions and 419 deletions

View File

@@ -2761,7 +2761,7 @@ Function5602: ; 5602
ld a, [wd459]
bit 7, a
jr z, .ok
ld a, [$ffe0]
ld a, [hLastTalked]
and a
jr z, .ok
call Function5629