diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-10-25 16:01:12 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-10-25 16:01:12 -0700 |
| commit | 07612257ccf21e0b5a4be28d7b5d9b7d9917d613 (patch) | |
| tree | ae88e3028cf13f549b2257383b9931d18298a9c0 /home/time.asm | |
| parent | 80329c54897a545b9b8b3e82b686b09f295bb67a (diff) | |
| parent | 046192575eec6405472ed2a43c701c7e25645c66 (diff) | |
Merge pull request #213 from yenatch/merge-mrwint
Merge mrwint/master into kanzure/master
Diffstat (limited to 'home/time.asm')
| -rw-r--r-- | home/time.asm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/home/time.asm b/home/time.asm index fff52b173..a9e43647f 100644 --- a/home/time.asm +++ b/home/time.asm @@ -192,8 +192,9 @@ Function658: ; 658 ld [StringBuffer2], a ld a, $0 ld [$d089], a - jr .asm_677 + jr Function677 +Function663: ; 663 call UpdateTime ld a, [hHours] ld [$d087], a @@ -201,12 +202,10 @@ Function658: ; 658 ld [$d088], a ld a, [hSeconds] ld [$d089], a - jr .asm_677 + jr Function677 -.asm_677 - ld a, $5 - ld hl, $40ed - rst FarCall +Function677 + callba Function140ed ret ; 67e |