diff options
| -rwxr-xr-x | engine/menus/pokedex.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 81bf543b..df91972f 100755 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -516,10 +516,10 @@ ShowPokedexDataInternal: inc de ; de = address of feet (height) ld a, [de] ; reads feet, but a is overwritten without being used push af - coord hl, 13, 6 + hlcoord 13, 6 lb bc, 1, 3 call PrintNumber ; print feet (height) - ld hl, $C426 + hlcoord 14, 6 pop af cp $a jr nc, .func_43d7 @@ -534,27 +534,27 @@ ShowPokedexDataInternal: inc de ; de = address of inches (height) push de ; put weight in big-endian order at hDexWeight - ld hl,hDexWeight - ld a,[hl] ; save existing value of [hDexWeight] + ld hl, hDexWeight + ld a, [hl] ; save existing value of [hDexWeight] push af - ld a,[de] ; a = upper byte of weight - ld [hli],a ; store upper byte of weight in [hDexWeight] - ld a,[hl] ; save existing value of [hDexWeight + 1] + ld a, [de] ; a = upper byte of weight + ld [hli], a ; store upper byte of weight in [hDexWeight] + ld a, [hl] ; save existing value of [hDexWeight + 1] push af dec de - ld a,[de] ; a = lower byte of weight - ld [hl],a ; store lower byte of weight in [hDexWeight + 1] - ld de,hDexWeight - coord hl, 12, 8 + ld a, [de] ; a = lower byte of weight + ld [hl], a ; store lower byte of weight in [hDexWeight + 1] + ld de, hDexWeight + hlcoord 12, 8 lb bc, 2, 4 ; 2 bytes, 4 digits call PrintNumber ; print weight - coord hl, 14, 8 - ld a,[hDexWeight + 1] - sub a,10 - ld a,[hDexWeight] + hlcoord 14, 8 + ld a, [hDexWeight + 1] + sub a, 10 + ld a, [hDexWeight] sbc a,0 - jr nc,.next - ld [hl],"0" ; if the weight is less than 10, put a 0 before the decimal point + jr nc, .next + ld [hl], "0" ; if the weight is less than 10, put a 0 before the decimal point .next inc hl ld a, [hli] |