diff options
Diffstat (limited to 'engine/pokemon')
| -rwxr-xr-x | engine/pokemon/health.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 4 | ||||
| -rwxr-xr-x | engine/pokemon/move_mon.asm | 24 |
3 files changed, 16 insertions, 16 deletions
diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm index a94a3ec3..8bf0752a 100755 --- a/engine/pokemon/health.asm +++ b/engine/pokemon/health.asm @@ -80,10 +80,10 @@ ComputeHPBarPixels: ldh [hDividend + 2], a .asm_c711 ld a, e - ldh [hPrintNum5], a + ldh [hDivisor], a ld b, $4 call Divide - ldh a, [hPrintNum4] + ldh a, [hQuotient + 3] ld e, a pop hl and a diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 6cc65879..aa211ae1 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -754,10 +754,10 @@ MonMenu_Softboiled_MilkDrink: call Divide ld a, MON_HP + 1 call GetPartyParamLocation - ldh a, [hQuotient + 2] + ldh a, [hQuotient + 3] sub [hl] dec hl - ldh a, [hQuotient + 1] + ldh a, [hQuotient + 2] sbc [hl] ret diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 5fce891f..f6ef241e 100755 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -793,11 +793,11 @@ Functiondd6a: ; dd6a (3:5d6a) pop bc ld hl, $8 add hl, bc - ldh a, [hQuotient] + ldh a, [hMultiplicand] ld [hli], a - ldh a, [hPrintNum3] + ldh a, [hMultiplicand + 1] ld [hli], a - ldh a, [hPrintNum4] + ldh a, [hMultiplicand + 2] ld [hl], a and a ret @@ -892,13 +892,13 @@ SendMonIntoBox: ; de74 (3:5e74) ld d, a callfar CalcExpAtLevel pop de - ldh a, [hQuotient] + ldh a, [hProduct + 1] ld [de], a inc de - ldh a, [hPrintNum3] + ldh a, [hProduct + 2] ld [de], a inc de - ldh a, [hPrintNum4] + ldh a, [hProduct + 3] ld [de], a inc de xor a @@ -1439,11 +1439,11 @@ CalcMonStatC: ; e181 jr nz, .not_hp ld a, [wCurPartyLevel] ld b, a - ldh a, [hQuotient + 2] + ldh a, [hQuotient + 3] add b ldh [hMultiplicand + 2], a jr nc, .no_overflow_3 - ldh a, [hQuotient + 1] + ldh a, [hQuotient + 2] inc a ldh [hMultiplicand + 1], a @@ -1452,21 +1452,21 @@ CalcMonStatC: ; e181 .not_hp ld b, a - ldh a, [hQuotient + 2] + ldh a, [hQuotient + 3] add b ldh [hMultiplicand + 2], a jr nc, .no_overflow_4 - ldh a, [hQuotient + 1] + ldh a, [hQuotient + 2] inc a ldh [hMultiplicand + 1], a .no_overflow_4 - ldh a, [hQuotient + 1] + ldh a, [hQuotient + 2] cp (1000 / $100) + 1 jr nc, .max_stat cp 1000 / $100 jr c, .stat_value_okay - ldh a, [hQuotient + 2] + ldh a, [hQuotient + 3] cp 1000 % $100 jr c, .stat_value_okay |