diff options
author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
---|---|---|
committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
commit | 286c160c27e58caad32f776cec684eb8cb2cb22a (patch) | |
tree | d89563a88a9674837896d6e88b9c9431b708bf97 /engine/evolution.asm | |
parent | c8a5720cca08631dcc20d036731e261a09a9a76e (diff) | |
parent | 188ac8a9b4816dd98df0108314e58885c3b07452 (diff) |
Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts:
engine/battle/1c.asm
Diffstat (limited to 'engine/evolution.asm')
-rwxr-xr-x | engine/evolution.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/evolution.asm b/engine/evolution.asm index 37aef792..8e511182 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -28,9 +28,9 @@ Func_7bde9: ; 7bde9 (1e:7de9) ld [wcf91], a ld [wd0b5], a call Func_7beb9 - ld de, $9000 - ld hl, $9310 - ld bc, $31 + ld de, vFrontPic + ld hl, vBackPic + ld bc, 7 * 7 call CopyVideoData ld a, [wHPBarMaxHP] ld [wcf91], a |