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 /battle/anim_commands.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'battle/anim_commands.asm')
| -rw-r--r-- | battle/anim_commands.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 266b76af2..48dc9c433 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -980,7 +980,7 @@ BattleAnimCmd_RaiseSub: ; cc640 (33:4640) GetSubstitutePic: ; cc64c ld hl, sScratch - ld bc, $310 + ld bc, (7 * 7) tiles .loop xor a ld [hli], a @@ -994,16 +994,16 @@ GetSubstitutePic: ; cc64c jr z, .player ld hl, MonsterSpriteGFX + 0 tiles - ld de, sScratch + $13 tiles + ld de, sScratch + (2 * 7 + 5) tiles call .CopyTile ld hl, MonsterSpriteGFX + 1 tiles - ld de, sScratch + $1a tiles + ld de, sScratch + (3 * 7 + 5) tiles call .CopyTile ld hl, MonsterSpriteGFX + 2 tiles - ld de, sScratch + $14 tiles + ld de, sScratch + (2 * 7 + 6) tiles call .CopyTile ld hl, MonsterSpriteGFX + 3 tiles - ld de, sScratch + $1b tiles + ld de, sScratch + (3 * 7 + 6) tiles call .CopyTile ld hl, VTiles2 tile $00 @@ -1014,16 +1014,16 @@ GetSubstitutePic: ; cc64c .player ld hl, MonsterSpriteGFX + 4 tiles - ld de, sScratch + $10 tiles + ld de, sScratch + (2 * 6 + 4) tiles call .CopyTile ld hl, MonsterSpriteGFX + 5 tiles - ld de, sScratch + $16 tiles + ld de, sScratch + (3 * 6 + 4) tiles call .CopyTile ld hl, MonsterSpriteGFX + 6 tiles - ld de, sScratch + $11 tiles + ld de, sScratch + (2 * 6 + 5) tiles call .CopyTile ld hl, MonsterSpriteGFX + 7 tiles - ld de, sScratch + $17 tiles + ld de, sScratch + (3 * 6 + 5) tiles call .CopyTile ld hl, VTiles2 tile $31 |