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 /engine/healmachineanim.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/healmachineanim.asm')
| -rwxr-xr-x | engine/healmachineanim.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/healmachineanim.asm b/engine/healmachineanim.asm index b4e0be1cf..01ed6d652 100755 --- a/engine/healmachineanim.asm +++ b/engine/healmachineanim.asm @@ -122,7 +122,7 @@ endr ret ; 123db -.dummy_5: ; 123db +.dummy_5 ; 123db ret ; 123dc @@ -168,7 +168,7 @@ INCBIN "gfx/unknown/0123fc.2bpp" ret ; 12451 -.palettes: ; 12451 +.palettes ; 12451 RGB 31, 31, 31 RGB 31, 19, 10 RGB 31, 07, 01 |