diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-04 11:46:23 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-04 11:46:23 -0400 |
| commit | 3713b71d9e3f3f1bc099d4704910cb9c1d172dcf (patch) | |
| tree | 03069bd1fb4576c16b773b23bab0071aabb7cabd /engine/move_mon.asm | |
| parent | 82f1534925c5fe1f0d876ea88119b0121cfa65a6 (diff) | |
More splitting of main.asm; remove unneeded rept 2
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 310eab8c2..100cb3f0e 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -654,7 +654,7 @@ SentGetPkmnIntoFromBox: ; db3f ld a, [sBoxCount] dec a ld b, a - call Functiondcb6 + call RestorePPofDepositedPokemon .CloseSRAM_And_ClearCarryFlag: call CloseSRAM and a @@ -667,7 +667,7 @@ CloseSRAM_And_SetCarryFlag: ; dcb1 ret ; dcb6 -Functiondcb6: ; dcb6 +RestorePPofDepositedPokemon: ; dcb6 ld a, b ld hl, sBoxMons ld bc, BOXMON_STRUCT_LENGTH @@ -696,10 +696,10 @@ Functiondcb6: ; dcb6 ld a, [MonType] push af ld b, 0 -.asm_dcec +.loop ld a, [hli] and a - jr z, .asm_dd18 + jr z, .done ld [TempMonMoves], a ld a, BOXMON ld [MonType], a @@ -722,9 +722,9 @@ Functiondcb6: ; dcb6 inc b ld a, b cp NUM_MOVES - jr c, .asm_dcec + jr c, .loop -.asm_dd18 +.done pop af ld [MonType], a pop af @@ -1025,7 +1025,7 @@ SentPkmnIntoBox: ; de6e call CopyBytes ld b, 0 - call Functiondcb6 + call RestorePPofDepositedPokemon call CloseSRAM scf |