diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /home/map_objects.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index f4a4d6d5b..3c70233eb 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -276,7 +276,7 @@ CheckObjectTime:: ; 18f5 and a ret -.TimeOfDayValues_191e +.TimeOfDayValues_191e: db 1 << MORN ; 1 db 1 << DAY ; 2 db 1 << NITE ; 4 @@ -351,7 +351,7 @@ ApplyDeletionToMapObject:: ; 1967 callba DeleteMapObject ret -.CheckStopFollow +.CheckStopFollow: ld hl, wObjectFollow_Leader cp [hl] jr z, .ok @@ -530,7 +530,7 @@ CopySpriteMovementData:: ; 1a61 ret ; 1a71 -.CopyData ; 1a71 +.CopyData: ; 1a71 ld hl, OBJECT_MOVEMENTTYPE add hl, de ld [hl], a |