diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-07 11:10:29 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-07 11:10:29 -0400 |
| commit | 45ed05decf330faab4503fe8fecadc54698c9724 (patch) | |
| tree | add3eeda2d09334209abe4e55341b674e64dd117 /home/move_mon.asm | |
| parent | PSYCHIC -> PSYCHIC_TYPE (PSYCHIC is ambiguous with PSYCHIC_M) (diff) | |
| download | pokeyellow-45ed05decf330faab4503fe8fecadc54698c9724.tar.gz pokeyellow-45ed05decf330faab4503fe8fecadc54698c9724.tar.xz pokeyellow-45ed05decf330faab4503fe8fecadc54698c9724.zip | |
Use HIGH() and LOW()
Diffstat (limited to 'home/move_mon.asm')
| -rw-r--r-- | home/move_mon.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/move_mon.asm b/home/move_mon.asm index 9fe7b067..cf7213b1 100644 --- a/home/move_mon.asm +++ b/home/move_mon.asm @@ -197,17 +197,17 @@ CalcStat:: ldh [hMultiplicand+1], a ; HP: (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + Level + 10 .noCarry4 ldh a, [hMultiplicand+1] ; check for overflow (>999) - cp 999 / $100 + 1 + cp HIGH(MAX_STAT_VALUE) + 1 jr nc, .overflow - cp 999 / $100 + cp HIGH(MAX_STAT_VALUE) jr c, .noOverflow ldh a, [hMultiplicand+2] - cp 999 % $100 + 1 + cp LOW(MAX_STAT_VALUE) + 1 jr c, .noOverflow .overflow - ld a, 999 / $100 ; overflow: cap at 999 + ld a, HIGH(MAX_STAT_VALUE) ; overflow: cap at 999 ldh [hMultiplicand+1], a - ld a, 999 % $100 + ld a, LOW(MAX_STAT_VALUE) ldh [hMultiplicand+2], a .noOverflow pop bc |