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/move_mon.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/move_mon.asm')
| -rwxr-xr-x | engine/move_mon.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 0a8c340ed..310eab8c2 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -655,7 +655,7 @@ SentGetPkmnIntoFromBox: ; db3f dec a ld b, a call Functiondcb6 -.CloseSRAM_And_ClearCarryFlag +.CloseSRAM_And_ClearCarryFlag: call CloseSRAM and a ret @@ -1032,7 +1032,7 @@ SentPkmnIntoBox: ; de6e ret ; df42 -.full: ; df42 +.full ; df42 call CloseSRAM and a ret @@ -1481,30 +1481,30 @@ endr pop bc jr .GotDV -.Attack +.Attack: ld a, [hl] swap a and $f jr .GotDV -.Defense +.Defense: ld a, [hl] and $f jr .GotDV -.Speed +.Speed: inc hl ld a, [hl] swap a and $f jr .GotDV -.Special +.Special: inc hl ld a, [hl] and $f -.GotDV +.GotDV: ld d, 0 add e ld e, a |