diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
| commit | 594253eb30e8e2ee8b4b9e0cfe7442eba0e3d3b4 (patch) | |
| tree | a2e0a3d80436e1d2279beb1aa07bf8217a586c32 /engine/map_objects.asm | |
| parent | 6c3000efd2818f8d5cb0a01770d1b92991b80340 (diff) | |
| parent | ec10d9dd6f8db685270529b49f0b3007a7242dcc (diff) | |
Merge yenatch:map-objects
Diffstat (limited to 'engine/map_objects.asm')
| -rw-r--r-- | engine/map_objects.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 0a4649384..01c74626e 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -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 |