diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-25 13:40:10 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-25 14:23:16 -0500 |
| commit | e34e68095df1f91dc5357669c187623d7cba39c6 (patch) | |
| tree | 5a452f39d9c44012df90a12f1524042c6dbcd062 /engine/move_mon.asm | |
| parent | da2b01a36c6855230ec36c42bd49e7cf2ca2d348 (diff) | |
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
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 4ee283e3e..90728e84c 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -1570,18 +1570,18 @@ CalcPkmnStatC: ; e17b .no_overflow_4 ld a, [hQuotient + 1] - cp (1000 / $100) + 1 + cp HIGH(MAX_STAT_VALUE + 1) + 1 jr nc, .max_stat - cp 1000 / $100 + cp HIGH(MAX_STAT_VALUE + 1) jr c, .stat_value_okay ld a, [hQuotient + 2] - cp 1000 % $100 + cp LOW(MAX_STAT_VALUE + 1) jr c, .stat_value_okay .max_stat - ld a, MAX_STAT_VALUE / $100 + ld a, HIGH(MAX_STAT_VALUE) ld [hMultiplicand + 1], a - ld a, MAX_STAT_VALUE % $100 + ld a, LOW(MAX_STAT_VALUE) ld [hMultiplicand + 2], a .stat_value_okay @@ -1702,9 +1702,9 @@ GivePoke:: ; e277 ld hl, PartyMon1ID ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes - ld a, 01001 / $100 + ld a, HIGH(01001) ld [hli], a - ld [hl], 01001 % $100 + ld [hl], LOW(01001) pop bc farcall SetGiftPartyMonCaughtData jr .skip_nickname |