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/evolve.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/evolve.asm')
| -rwxr-xr-x | engine/evolve.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/evolve.asm b/engine/evolve.asm index b04a245e0..db7d7e946 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -336,7 +336,7 @@ endr ; XXX pop hl -.ReturnToMap +.ReturnToMap: pop de pop bc pop hl @@ -514,17 +514,17 @@ FillMoves: ; 424e1 ld a, [hli] ld h, [hl] ld l, a -.GoToAttacks +.GoToAttacks: ld a, [hli] and a jr nz, .GoToAttacks jr .GetLevel -.NextMove +.NextMove: pop de -.GetMove +.GetMove: inc hl -.GetLevel +.GetLevel: ld a, [hli] and a jp z, .done @@ -539,10 +539,10 @@ FillMoves: ; 424e1 cp b jr nc, .GetMove -.CheckMove +.CheckMove: push de ld c, NUM_MOVES -.CheckRepeat +.CheckRepeat: ld a, [de] inc de cp [hl] @@ -552,7 +552,7 @@ FillMoves: ; 424e1 pop de push de ld c, NUM_MOVES -.CheckSlot +.CheckSlot: ld a, [de] and a jr z, .LearnMove @@ -576,10 +576,10 @@ FillMoves: ; 424e1 call ShiftMoves pop de -.ShiftedMove +.ShiftedMove: pop hl -.LearnMove +.LearnMove: ld a, [hl] ld [de], a ld a, [Buffer1] |