diff options
| author | yenatch <yenatch@gmail.com> | 2016-08-11 15:55:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 15:55:32 -0400 |
| commit | 700321a7fb2d6c852ffc91cc0b8867526cb76813 (patch) | |
| tree | 1a81b2ef5a4d7a2e5a9433e990ea178f5083acbf /engine/move_mon.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | 050a0162b89c645c4a2a3ed311c4da791fb3de6c (diff) | |
Merge pull request #342 from PikalaxALT/master
More label interpretations
Diffstat (limited to 'engine/move_mon.asm')
| -rwxr-xr-x | engine/move_mon.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 310eab8c2..e07237d68 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -266,15 +266,15 @@ endr ld [de], a inc de ld hl, EnemyMonStatus - ; Copy EnemyMonStatus + ; Copy EnemyMonStatus ld a, [hli] ld [de], a inc de - ; Copy EnemyMonUnused + ; Copy EnemyMonUnused ld a, [hli] ld [de], a inc de - ; Copy EnemyMonHP + ; Copy EnemyMonHP ld a, [hli] ld [de], a inc de @@ -452,8 +452,8 @@ SentGetPkmnIntoFromBox: ; db3f ld hl, wBreedMon1Species jr z, .breedmon - ; we want to sent a Pkmn into the Box - ; so check if there's enough space + ; we want to sent a Pkmn into the Box + ; so check if there's enough space ld hl, sBoxCount ld a, [hl] cp MONS_PER_BOX @@ -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 @@ -973,7 +973,7 @@ SentPkmnIntoBox: ; de6e ld [de], a inc de - ; Set all 5 Experience Values to 0 + ; Set all 5 Experience Values to 0 xor a ld b, 2 * 5 .loop2 @@ -1025,7 +1025,7 @@ SentPkmnIntoBox: ; de6e call CopyBytes ld b, 0 - call Functiondcb6 + call RestorePPofDepositedPokemon call CloseSRAM scf @@ -1459,9 +1459,9 @@ CalcPkmnStatC: ; e17b ld a, [hl] swap a and $1 -rept 3 add a -endr + add a + add a ld b, a ld a, [hli] and $1 |