diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /engine/evos_moves.asm | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| parent | No more ldh (diff) | |
| download | pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'engine/evos_moves.asm')
| -rwxr-xr-x | engine/evos_moves.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 23bffa8d..bddaffe5 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -117,7 +117,7 @@ Evolution_PartyMonLoop: ; loop over party mons call CopyStringToCF4B ld hl, IsEvolvingText call PrintText - ld c, $32 + ld c, 50 call DelayFrames xor a ld [H_AUTOBGTRANSFERENABLED], a @@ -129,7 +129,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, $ff ld [wUpdateSpritesEnabled], a call ClearSprites - callab Func_7bde9 + callab EvolveMon jp c, CancelledEvolution ld hl, EvolvedText call PrintText @@ -149,7 +149,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, (SFX_02_3b - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent call WaitForSoundToFinish - ld c, $28 + ld c, 40 call DelayFrames call ClearScreen call RenameEvolvedMon @@ -407,13 +407,13 @@ WriteMonMoves: ; 3afb8 (e:6fb8) and a jp z, .done ; end of list ld b, a - ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL + ld a, [W_CURENEMYLVL] cp b jp c, .done ; mon level < move level (assumption: learnset is sorted by level) ld a, [wHPBarMaxHP] and a jr z, .skipMinLevelCheck - ld a, [wWhichTrade] ; wWhichTrade (min move level) + ld a, [wWhichTrade] ; min move level) cp b jr nc, .nextMove2 ; min level >= move level .skipMinLevelCheck |