diff options
Diffstat (limited to 'engine/menu/pokedex.asm')
| -rwxr-xr-x | engine/menu/pokedex.asm | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index bf8afaa9..2b66cda1 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -360,19 +360,19 @@ DrawPokedexVerticalLine: ret PokedexSeenText: - db "SEEN@" + db "VUS@" PokedexOwnText: - db "OWN@" + db "PRIS@" PokedexContentsText: - db "CONTENTS@" + db "SOMMAIRE@" PokedexMenuItemsText: - db "DATA" - next "CRY" - next "AREA" - next "QUIT@" + db "INFO" + next "CRI" + next "ZONE" + next "RET@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields ; INPUT: @@ -515,22 +515,23 @@ ShowPokedexDataInternal: jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description inc de ; de = address of feet (height) ld a,[de] ; reads feet, but a is overwritten without being used - coord hl, 12, 6 - lb bc, 1, 2 + push af + coord hl, 13, 6 + lb bc, 1, 3 call PrintNumber ; print feet (height) - ld a,$60 ; feet symbol tile (one tick) - ld [hl],a - inc de - inc de ; de = address of inches (height) - coord hl, 15, 6 - lb bc, LEADING_ZEROES | 1, 2 - call PrintNumber ; print inches (height) - ld a,$61 ; inches symbol tile (two ticks) - ld [hl],a -; now print the weight (note that weight is stored in tenths of pounds internally) + ld hl, $C426 + pop af + cp $a + jr nc, .func_43d7 + ld [hl], $F6 +.func_43d7 + inc hl + ld a, [hli] + ldd [hl], a + ld [hl], $F2 inc de inc de - inc de ; de = address of upper byte of weight + inc de ; de = address of inches (height) push de ; put weight in big-endian order at hDexWeight ld hl,hDexWeight @@ -544,8 +545,8 @@ ShowPokedexDataInternal: ld a,[de] ; a = lower byte of weight ld [hl],a ; store lower byte of weight in [hDexWeight + 1] ld de,hDexWeight - coord hl, 11, 8 - lb bc, 2, 5 ; 2 bytes, 5 digits + coord hl, 12, 8 + lb bc, 2, 4 ; 2 bytes, 4 digits call PrintNumber ; print weight coord hl, 14, 8 ld a,[hDexWeight + 1] @@ -590,8 +591,8 @@ ShowPokedexDataInternal: ret HeightWeightText: - db "HT ?",$60,"??",$61 - next "WT ???lb@" + db "TAI ???",$60 + next "PDS ???",$61,$62,"@" ; XXX does anything point to this? PokeText: |