1 files changed, 447 insertions, 340 deletions

diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 3078f1a9..5bc8f119 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -2,53 +2,57 @@ ShowPokedexMenu:
 	call GBPalWhiteOut
 	call ClearScreen
 	call UpdateSprites
-	ld a,[wListScrollOffset]
+	ld a, [wListScrollOffset]
 	push af
 	xor a
-	ld [wCurrentMenuItem],a
-	ld [wListScrollOffset],a
-	ld [wLastMenuItem],a
+	ld [wCurrentMenuItem], a
+	ld [wListScrollOffset], a
+	ld [wLastMenuItem], a
 	inc a
-	ld [wd11e],a
-	ld [hJoy7],a
+	ld [wd11e], a
+	ld [hJoy7], a
 .setUpGraphics
+	callab LoadPokedexTilePatterns
+.loop
 	ld b, SET_PAL_GENERIC
 	call RunPaletteCommand
-	callab LoadPokedexTilePatterns
 .doPokemonListMenu
-	ld hl,wTopMenuItemY
-	ld a,3
-	ld [hli],a ; top menu item Y
+	ld hl, wTopMenuItemY
+	ld a, 3
+	ld [hli], a ; top menu item Y
 	xor a
-	ld [hli],a ; top menu item X
+	ld [hli], a ; top menu item X
 	inc a
-	ld [wMenuWatchMovingOutOfBounds],a
+	ld [wMenuWatchMovingOutOfBounds], a
 	inc hl
 	inc hl
-	ld a,6
-	ld [hli],a ; max menu item ID
-	ld [hl],D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON
+	ld a, 6
+	ld [hli], a ; max menu item ID
+	ld [hl], D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON
 	call HandlePokedexListMenu
-	jr c,.goToSideMenu ; if the player chose a pokemon from the list
+	jr c, .goToSideMenu ; if the player chose a pokemon from the list
 .exitPokedex
 	xor a
-	ld [wMenuWatchMovingOutOfBounds],a
-	ld [wCurrentMenuItem],a
-	ld [wLastMenuItem],a
-	ld [hJoy7],a
-	ld [wWastedByteCD3A],a
-	ld [wOverrideSimulatedJoypadStatesMask],a
+	ld [wMenuWatchMovingOutOfBounds], a
+	ld [wCurrentMenuItem], a
+	ld [wLastMenuItem], a
+	ld [hJoy7], a
+	ld [wWastedByteCD3A], a
+	ld [wOverrideSimulatedJoypadStatesMask], a
 	pop af
-	ld [wListScrollOffset],a
+	ld [wListScrollOffset], a
 	call GBPalWhiteOutWithDelay3
 	call RunDefaultPaletteCommand
 	jp ReloadMapData
+
 .goToSideMenu
 	call HandlePokedexSideMenu
 	dec b
-	jr z,.exitPokedex ; if the player chose Quit
+	jr z, .exitPokedex ; if the player chose Quit
+	dec b
+	jr z, .doPokemonListMenu ; if pokemon not seen or player pressed B button
 	dec b
-	jr z,.doPokemonListMenu ; if pokemon not seen or player pressed B button
+	jr z, .loop
 	jp .setUpGraphics ; if pokemon data or area was shown
 
 ; handles the menu on the lower right in the pokedex screen
@@ -59,204 +63,337 @@ ShowPokedexMenu:
 ; 02: the pokemon has not been seen yet or the player pressed the B button
 HandlePokedexSideMenu:
 	call PlaceUnfilledArrowMenuCursor
-	ld a,[wCurrentMenuItem]
+	ld a, [wCurrentMenuItem]
 	push af
-	ld b,a
-	ld a,[wLastMenuItem]
+	ld b, a
+	ld a, [wLastMenuItem]
 	push af
-	ld a,[wListScrollOffset]
+	ld a, [wListScrollOffset]
 	push af
 	add b
 	inc a
-	ld [wd11e],a
-	ld a,[wd11e]
+	ld [wd11e], a
+	ld a, [wd11e]
 	push af
-	ld a,[wDexMaxSeenMon]
+	ld a, [wDexMaxSeenMon]
 	push af ; this doesn't need to be preserved
-	ld hl,wPokedexSeen
+	ld hl, wPokedexSeen
 	call IsPokemonBitSet
-	ld b,2
-	jr z,.exitSideMenu
+	ld b, 2
+	jr z, .exitSideMenu
 	call PokedexToIndex
-	ld hl,wTopMenuItemY
-	ld a,10
-	ld [hli],a ; top menu item Y
-	ld a,15
-	ld [hli],a ; top menu item X
+	ld hl, wTopMenuItemY
+	ld a, 8
+	ld [hli], a ; top menu item Y
+	ld a, 15
+	ld [hli], a ; top menu item X
 	xor a
-	ld [hli],a ; current menu item ID
+	ld [hli], a ; current menu item ID
 	inc hl
-	ld a,3
-	ld [hli],a ; max menu item ID
-	;ld a, A_BUTTON | B_BUTTON
-	ld [hli],a ; menu watched keys (A button and B button)
+	ld a, 4
+	ld [hli], a ; max menu item ID
+	ld a, A_BUTTON | B_BUTTON
+	ld [hli], a ; menu watched keys (A button and B button)
 	xor a
-	ld [hli],a ; old menu item ID
-	ld [wMenuWatchMovingOutOfBounds],a
+	ld [hli], a ; old menu item ID
+	ld [wMenuWatchMovingOutOfBounds], a
+	ld [hJoy7], a
 .handleMenuInput
 	call HandleMenuInput
-	bit 1,a ; was the B button pressed?
-	ld b,2
-	jr nz,.buttonBPressed
-	ld a,[wCurrentMenuItem]
+	bit 1, a ; was the B button pressed?
+	ld b, 2
+	jr nz, .buttonBPressed
+	ld a, [wCurrentMenuItem]
 	and a
-	jr z,.choseData
+	jr z, .choseData
+	dec a
+	jr z, .choseCry
 	dec a
-	jr z,.choseCry
+	jr z, .choseArea
 	dec a
-	jr z,.choseArea
+	jr z, .chosePrint
 .choseQuit
-	ld b,1
+	ld b, 1
 .exitSideMenu
 	pop af
-	ld [wDexMaxSeenMon],a
+	ld [wDexMaxSeenMon], a
 	pop af
-	ld [wd11e],a
+	ld [wd11e], a
 	pop af
-	ld [wListScrollOffset],a
+	ld [wListScrollOffset], a
 	pop af
-	ld [wLastMenuItem],a
+	ld [wLastMenuItem], a
 	pop af
-	ld [wCurrentMenuItem],a
+	ld [wCurrentMenuItem], a
+	ld a, $1
+	ld [hJoy7], a
 	push bc
 	coord hl, 0, 3
-	ld de,20
+	ld de, 20
 	lb bc, " ", 13
 	call DrawTileLine ; cover up the menu cursor in the pokemon list
 	pop bc
 	ret
+
 .buttonBPressed
 	push bc
-	coord hl, 15, 10
-	ld de,20
-	lb bc, " ", 7
+	coord hl, 15, 8
+	ld de, 20
+	lb bc, " ", 9
 	call DrawTileLine ; cover up the menu cursor in the side menu
 	pop bc
 	jr .exitSideMenu
+
 .choseData
 	call ShowPokedexDataInternal
-	ld b,0
+	ld b, 0
 	jr .exitSideMenu
+
 ; play pokemon cry
 .choseCry
-	ld a,[wd11e]
+	ld a, [wd11e]
 	call GetCryData
 	call PlaySound
 	jr .handleMenuInput
+
 .choseArea
 	predef LoadTownMap_Nest ; display pokemon areas
-	ld b,0
+	ld b, 0
+	jr .exitSideMenu
+
+.chosePrint
+	ld a, [hTilesetType]
+	push af
+	xor a
+	ld [hTilesetType], a
+	ld a, [wd11e]
+	ld [wcf91], a
+	callab PrintPokedexEntry
+	xor a
+	ld [H_AUTOBGTRANSFERENABLED], a
+	call ClearScreen
+	pop af
+	ld [hTilesetType], a
+	ld b, $3
 	jr .exitSideMenu
 
 ; handles the list of pokemon on the left of the pokedex screen
 ; sets carry flag if player presses A, unsets carry flag if player presses B
 HandlePokedexListMenu:
+	call Pokedex_DrawInterface
+.loop
+	call Pokedex_PlacePokemonList
+	call GBPalNormal
+	call HandleMenuInput
+	bit BIT_B_BUTTON, a ; was the B button pressed?
+	jp nz, .buttonBPressed
+	bit BIT_A_BUTTON, a ; was the A button pressed?
+	jp nz, .buttonAPressed
+.checkIfUpPressed
+	bit BIT_D_UP, a ; was Up pressed?
+	jr z, .checkIfDownPressed
+.upPressed ; scroll up one row
+	ld a, [wListScrollOffset]
+	and a
+	jp z, .loop
+	dec a
+	ld [wListScrollOffset], a
+	jp .loop
+
+.checkIfDownPressed
+	bit BIT_D_DOWN, a ; was Down pressed?
+	jr z, .checkIfRightPressed
+.downPressed ; scroll down one row
+	ld a, [wDexMaxSeenMon]
+	cp a, 7
+	jp c, .loop ; can't if the list is shorter than 7
+	sub a, 7
+	ld b, a
+	ld a, [wListScrollOffset]
+	cp b
+	jp z, .loop
+	inc a
+	ld [wListScrollOffset], a
+	jp .loop
+
+.checkIfRightPressed
+	bit BIT_D_RIGHT, a ; was Right pressed?
+	jr z, .checkIfLeftPressed
+.rightPressed ; scroll down 7 rows
+	ld a, [wDexMaxSeenMon]
+	cp a, 7
+	jp c, .loop ; can't if the list is shorter than 7
+	sub a, 6
+	ld b, a
+	ld a, [wListScrollOffset]
+	add a, 7
+	ld [wListScrollOffset], a
+	cp b
+	jp c, .loop
+	dec b
+	ld a, b
+	ld [wListScrollOffset], a
+	jp .loop
+
+.checkIfLeftPressed ; scroll up 7 rows
+	bit BIT_D_LEFT, a ; was Left pressed?
+	jr z, .buttonAPressed
+.leftPressed
+	ld a, [wListScrollOffset]
+	sub a, 7
+	ld [wListScrollOffset], a
+	jp nc, .loop
+	xor a
+	ld [wListScrollOffset], a
+	jp .loop
+
+.buttonAPressed
+	scf
+	ret
+
+.buttonBPressed
+	and a
+	ret
+
+Pokedex_DrawInterface:
 	xor a
-	ld [H_AUTOBGTRANSFERENABLED],a
+	ld [H_AUTOBGTRANSFERENABLED], a
 ; draw the horizontal line separating the seen and owned amounts from the menu
-	coord hl, 15, 8
-	ld a,$7a ; horizontal line tile
-	ld [hli],a
-	ld [hli],a
-	ld [hli],a
-	ld [hli],a
-	ld [hli],a
+	coord hl, 15, 6
+	ld a, $7a ; horizontal line tile
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
 	coord hl, 14, 0
-	ld [hl],$71 ; vertical line tile
+	ld [hl], $71 ; vertical line tile
 	coord hl, 14, 1
 	call DrawPokedexVerticalLine
 	coord hl, 14, 9
 	call DrawPokedexVerticalLine
-	ld hl,wPokedexSeen
-	ld b,wPokedexSeenEnd - wPokedexSeen
+	ld hl, wPokedexSeen
+	ld b, wPokedexSeenEnd - wPokedexSeen
 	call CountSetBits
 	ld de, wNumSetBits
-	coord hl, 16, 3
+	coord hl, 16, 2
 	lb bc, 1, 3
 	call PrintNumber ; print number of seen pokemon
-	ld hl,wPokedexOwned
-	ld b,wPokedexOwnedEnd - wPokedexOwned
+	ld hl, wPokedexOwned
+	ld b, wPokedexOwnedEnd - wPokedexOwned
 	call CountSetBits
 	ld de, wNumSetBits
-	coord hl, 16, 6
+	coord hl, 16, 5
 	lb bc, 1, 3
 	call PrintNumber ; print number of owned pokemon
-	coord hl, 16, 2
-	ld de,PokedexSeenText
+	coord hl, 16, 1
+	ld de, PokedexSeenText
 	call PlaceString
-	coord hl, 16, 5
-	ld de,PokedexOwnText
+	coord hl, 16, 4
+	ld de, PokedexOwnText
 	call PlaceString
 	coord hl, 1, 1
-	ld de,PokedexContentsText
+	ld de, PokedexContentsText
 	call PlaceString
-	coord hl, 16, 10
-	ld de,PokedexMenuItemsText
+	coord hl, 16, 8
+	ld de, PokedexMenuItemsText
 	call PlaceString
 ; find the highest pokedex number among the pokemon the player has seen
-	ld hl,wPokedexSeenEnd - 1
-	ld b,(wPokedexSeenEnd - wPokedexSeen) * 8 + 1
+	ld hl, wPokedexSeenEnd - 1
+	ld b, (wPokedexSeenEnd - wPokedexSeen) * 8 + 1
 .maxSeenPokemonLoop
-	ld a,[hld]
-	ld c,8
+	ld a, [hld]
+	ld c, 8
 .maxSeenPokemonInnerLoop
 	dec b
 	sla a
-	jr c,.storeMaxSeenPokemon
+	jr c, .storeMaxSeenPokemon
 	dec c
-	jr nz,.maxSeenPokemonInnerLoop
+	jr nz, .maxSeenPokemonInnerLoop
 	jr .maxSeenPokemonLoop
+
 .storeMaxSeenPokemon
-	ld a,b
-	ld [wDexMaxSeenMon],a
+	ld a, b
+	ld [wDexMaxSeenMon], a
+	ret
+
+DrawPokedexVerticalLine:
+	ld c, 9 ; height of line
+	ld de, SCREEN_WIDTH ; width of screen
+	ld a, $71 ; vertical line tile
 .loop
+	ld [hl], a
+	add hl, de
+	xor a, 1 ; toggle between vertical line tile and box tile
+	dec c
+	jr nz, .loop
+	ret
+
+PokedexSeenText:
+	db "SEEN@"
+
+PokedexOwnText:
+	db "OWN@"
+
+PokedexContentsText:
+	db "CONTENTS@"
+
+PokedexMenuItemsText:
+	db   "DATA"
+	next "CRY"
+	next "AREA"
+	next "PRNT"
+	next "QUIT@"
+
+Pokedex_PlacePokemonList:
 	xor a
-	ld [H_AUTOBGTRANSFERENABLED],a
+	ld [H_AUTOBGTRANSFERENABLED], a
 	coord hl, 4, 2
 	lb bc, 14, 10
 	call ClearScreenArea
 	coord hl, 1, 3
-	ld a,[wListScrollOffset]
-	ld [wd11e],a
-	ld d,7
-	ld a,[wDexMaxSeenMon]
-	cp a,7
-	jr nc,.printPokemonLoop
-	ld d,a
+	ld a, [wListScrollOffset]
+	ld [wd11e], a
+	ld d, 7
+	ld a, [wDexMaxSeenMon]
+	cp a, 7
+	jr nc, .printPokemonLoop
+	ld d, a
 	dec a
-	ld [wMaxMenuItem],a
+	ld [wMaxMenuItem], a
 ; loop to print pokemon pokedex numbers and names
 ; if the player has owned the pokemon, it puts a pokeball beside the name
 .printPokemonLoop
-	ld a,[wd11e]
+	ld a, [wd11e]
 	inc a
-	ld [wd11e],a
+	ld [wd11e], a
 	push af
 	push de
 	push hl
-	ld de,-SCREEN_WIDTH
-	add hl,de
-	ld de,wd11e
+	ld de, -SCREEN_WIDTH
+	add hl, de
+	ld de, wd11e
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber ; print the pokedex number
-	ld de,SCREEN_WIDTH
-	add hl,de
+	ld de, SCREEN_WIDTH
+	add hl, de
 	dec hl
 	push hl
-	ld hl,wPokedexOwned
+	ld hl, wPokedexOwned
 	call IsPokemonBitSet
 	pop hl
-	ld a," "
-	jr z,.writeTile
-	ld a,$72 ; pokeball tile
+	ld a, " "
+	jr z, .writeTile
+	ld a, $72 ; pokeball tile
 .writeTile
-	ld [hl],a ; put a pokeball next to pokemon that the player has owned
+	ld [hl], a ; put a pokeball next to pokemon that the player has owned
 	push hl
-	ld hl,wPokedexSeen
+	ld hl, wPokedexSeen
 	call IsPokemonBitSet
-	jr nz,.getPokemonName ; if the player has seen the pokemon
-	ld de,.dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon
+	jr nz, .getPokemonName ; if the player has seen the pokemon
+	ld de, .dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon
 	jr .skipGettingName
+
 .dashedLine ; for unseen pokemon in the list
 	db "----------@"
 .getPokemonName
@@ -267,119 +404,29 @@ HandlePokedexListMenu:
 	inc hl
 	call PlaceString
 	pop hl
-	ld bc,2 * 20
-	add hl,bc
+	ld bc, 2 * 20
+	add hl, bc
 	pop de
 	pop af
-	ld [wd11e],a
+	ld [wd11e], a
 	dec d
-	jr nz,.printPokemonLoop
-	ld a,01
-	ld [H_AUTOBGTRANSFERENABLED],a
+	jr nz, .printPokemonLoop
+	ld a, 01
+	ld [H_AUTOBGTRANSFERENABLED], a
 	call Delay3
-	call GBPalNormal
-	call HandleMenuInput
-	bit 1,a ; was the B button pressed?
-	jp nz,.buttonBPressed
-.checkIfUpPressed
-	bit 6,a ; was Up pressed?
-	jr z,.checkIfDownPressed
-.upPressed ; scroll up one row
-	ld a,[wListScrollOffset]
-	and a
-	jp z,.loop
-	dec a
-	ld [wListScrollOffset],a
-	jp .loop
-.checkIfDownPressed
-	bit 7,a ; was Down pressed?
-	jr z,.checkIfRightPressed
-.downPressed ; scroll down one row
-	ld a,[wDexMaxSeenMon]
-	cp a,7
-	jp c,.loop ; can't if the list is shorter than 7
-	sub a,7
-	ld b,a
-	ld a,[wListScrollOffset]
-	cp b
-	jp z,.loop
-	inc a
-	ld [wListScrollOffset],a
-	jp .loop
-.checkIfRightPressed
-	bit 4,a ; was Right pressed?
-	jr z,.checkIfLeftPressed
-.rightPressed ; scroll down 7 rows
-	ld a,[wDexMaxSeenMon]
-	cp a,7
-	jp c,.loop ; can't if the list is shorter than 7
-	sub a,6
-	ld b,a
-	ld a,[wListScrollOffset]
-	add a,7
-	ld [wListScrollOffset],a
-	cp b
-	jp c,.loop
-	dec b
-	ld a,b
-	ld [wListScrollOffset],a
-	jp .loop
-.checkIfLeftPressed ; scroll up 7 rows
-	bit 5,a ; was Left pressed?
-	jr z,.buttonAPressed
-.leftPressed
-	ld a,[wListScrollOffset]
-	sub a,7
-	ld [wListScrollOffset],a
-	jp nc,.loop
-	xor a
-	ld [wListScrollOffset],a
-	jp .loop
-.buttonAPressed
-	scf
-	ret
-.buttonBPressed
-	and a
-	ret
-
-DrawPokedexVerticalLine:
-	ld c,9 ; height of line
-	ld de,20 ; width of screen
-	ld a,$71 ; vertical line tile
-.loop
-	ld [hl],a
-	add hl,de
-	xor a,1 ; toggle between vertical line tile and box tile
-	dec c
-	jr nz,.loop
 	ret
 
-PokedexSeenText:
-	db "SEEN@"
-
-PokedexOwnText:
-	db "OWN@"
-
-PokedexContentsText:
-	db "CONTENTS@"
-
-PokedexMenuItemsText:
-	db   "DATA"
-	next "CRY"
-	next "AREA"
-	next "QUIT@"
-
 ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
 ; INPUT:
 ; [wd11e] = pokedex number
 ; hl = address of bit field
 IsPokemonBitSet:
-	ld a,[wd11e]
+	ld a, [wd11e]
 	dec a
-	ld c,a
-	ld b,FLAG_TEST
+	ld c, a
+	ld b, FLAG_TEST
 	predef FlagActionPredef
-	ld a,c
+	ld a, c
 	and a
 	ret
 
@@ -392,195 +439,255 @@ ShowPokedexData:
 
 ; function to display pokedex data from inside the pokedex
 ShowPokedexDataInternal:
-	ld hl,wd72c
-	set 1,[hl]
-	ld a,$33 ; 3/7 volume
-	ld [rNR50],a
+	ld hl, wd72c
+	set 1, [hl]
+	ld a, $33 ; 3/7 volume
+	ld [rNR50], a
+	ld a, [hTilesetType]
+	push af
+	xor a
+	ld [hTilesetType], a
 	call GBPalWhiteOut ; zero all palettes
-	call ClearScreen
-	ld a,[wd11e] ; pokemon ID
-	ld [wcf91],a
+	ld a, [wd11e] ; pokemon ID
+	ld [wcf91], a
 	push af
 	ld b, SET_PAL_POKEDEX
 	call RunPaletteCommand
 	pop af
-	ld [wd11e],a
-	ld a,[hTilesetType]
-	push af
-	xor a
-	ld [hTilesetType],a
+	ld [wd11e], a
+	call DrawDexEntryOnScreen
+	call c, Pokedex_PrintFlavorTextAtRow11
+.waitForButtonPress
+	call JoypadLowSensitivity
+	ld a, [hJoy5]
+	and a, A_BUTTON | B_BUTTON
+	jr z, .waitForButtonPress
+	pop af
+	ld [hTilesetType], a
+	call GBPalWhiteOut
+	call ClearScreen
+	call RunDefaultPaletteCommand
+	call LoadTextBoxTilePatterns
+	call GBPalNormal
+	ld hl, wd72c
+	res 1, [hl]
+	ld a, $77 ; max volume
+	ld [rNR50], a
+	ret
+
+HeightWeightText:
+	db "HT  ?", $60, "??", $61
+	next "WT   ???lb@"
+
+; XXX does anything point to this?
+PokeText:
+	db "#@"
+
+; horizontal line that divides the pokedex text description from the rest of the data
+PokedexDataDividerLine:
+	db $68, $69, $6B, $69, $6B
+	db $69, $6B, $69, $6B, $6B
+	db $6B, $6B, $69, $6B, $69
+	db $6B, $69, $6B, $69, $6A
+	db "@"
+
+DrawDexEntryOnScreen:
+	call ClearScreen
+
 	coord hl, 0, 0
-	ld de,1
+	ld de, 1
 	lb bc, $64, SCREEN_WIDTH
 	call DrawTileLine ; draw top border
+
 	coord hl, 0, 17
 	ld b, $6f
 	call DrawTileLine ; draw bottom border
+
 	coord hl, 0, 1
-	ld de,20
+	ld de, 20
 	lb bc, $66, $10
 	call DrawTileLine ; draw left border
+
 	coord hl, 19, 1
-	ld b,$67
+	ld b, $67
 	call DrawTileLine ; draw right border
-	ld a,$63 ; upper left corner tile
+
+	ld a, $63 ; upper left corner tile
 	Coorda 0, 0
-	ld a,$65 ; upper right corner tile
+	ld a, $65 ; upper right corner tile
 	Coorda 19, 0
-	ld a,$6c ; lower left corner tile
+	ld a, $6c ; lower left corner tile
 	Coorda 0, 17
-	ld a,$6e ; lower right corner tile
+	ld a, $6e ; lower right corner tile
+
 	Coorda 19, 17
 	coord hl, 0, 9
-	ld de,PokedexDataDividerLine
+
+	ld de, PokedexDataDividerLine
 	call PlaceString ; draw horizontal divider line
+
 	coord hl, 9, 6
-	ld de,HeightWeightText
+	ld de, HeightWeightText
 	call PlaceString
+
 	call GetMonName
 	coord hl, 9, 2
 	call PlaceString
-	ld hl,PokedexEntryPointers
-	ld a,[wd11e]
+
+	ld hl, PokedexEntryPointers
+	ld a, [wd11e]
 	dec a
-	ld e,a
-	ld d,0
-	add hl,de
-	add hl,de
-	ld a,[hli]
-	ld e,a
-	ld d,[hl] ; de = address of pokedex entry
+	ld e, a
+	ld d, 0
+	add hl, de
+	add hl, de
+	ld a, [hli]
+	ld e, a
+	ld d, [hl] ; de = address of pokedex entry
+
 	coord hl, 9, 4
 	call PlaceString ; print species name
-	ld h,b
-	ld l,c
+
+	ld h, b
+	ld l, c
 	push de
-	ld a,[wd11e]
+	ld a, [wd11e]
 	push af
 	call IndexToPokedex
+
 	coord hl, 2, 8
 	ld a, "№"
-	ld [hli],a
-	ld a,$f2
-	ld [hli],a
-	ld de,wd11e
+	ld [hli], a
+	ld a, $f2
+	ld [hli], a
+	ld de, wd11e
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber ; print pokedex number
-	ld hl,wPokedexOwned
+
+	ld hl, wPokedexOwned
 	call IsPokemonBitSet
 	pop af
-	ld [wd11e],a
-	ld a,[wcf91]
-	ld [wd0b5],a
+	ld [wd11e], a
+	ld a, [wcf91]
+	ld [wd0b5], a
 	pop de
+
 	push af
 	push bc
 	push de
 	push hl
+
 	call Delay3
 	call GBPalNormal
 	call GetMonHeader ; load pokemon picture location
 	coord hl, 1, 1
 	call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture
-	ld a,[wcf91]
+	ld a, [wcf91]
 	call PlayCry ; play pokemon cry
+
 	pop hl
 	pop de
 	pop bc
 	pop af
-	ld a,c
+
+	ld a, c
 	and a
-	jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description
+	ret z ; 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
+	ld a, [de] ; reads feet, but a is overwritten without being used
 	coord hl, 12, 6
 	lb bc, 1, 2
 	call PrintNumber ; print feet (height)
-	ld a,$60 ; feet symbol tile (one tick)
-	ld [hl],a
+	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
+	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)
 	inc de
 	inc de
 	inc de ; de = address of upper byte of weight
 	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
+	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
 	call PrintNumber ; print weight
 	coord hl, 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
+	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
 .next
 	inc hl
-	ld a,[hli]
-	ld [hld],a ; make space for the decimal point by moving the last digit forward one tile
-	ld [hl],$f2 ; decimal point tile
+	ld a, [hli]
+	ld [hld], a ; make space for the decimal point by moving the last digit forward one tile
+	ld [hl], $f2 ; decimal point tile
 	pop af
-	ld [hDexWeight + 1],a ; restore original value of [hDexWeight + 1]
+	ld [hDexWeight + 1], a ; restore original value of [hDexWeight + 1]
 	pop af
-	ld [hDexWeight],a ; restore original value of [hDexWeight]
+	ld [hDexWeight], a ; restore original value of [hDexWeight]
 	pop hl
 	inc hl ; hl = address of pokedex description text
+	scf
+	ret
+
+Pokedex_PrintFlavorTextAtRow11:
 	coord bc, 1, 11
-	ld a,2
-	ld [$fff4],a
+Pokedex_PrintFlavorTextAtBC:
+	ld a, 2
+	ld [$fff9], a
 	call TextCommandProcessor ; print pokedex description text
 	xor a
-	ld [$fff4],a
-.waitForButtonPress
-	call JoypadLowSensitivity
-	ld a,[hJoy5]
-	and a,A_BUTTON | B_BUTTON
-	jr z,.waitForButtonPress
-	pop af
-	ld [hTilesetType],a
-	call GBPalWhiteOut
-	call ClearScreen
-	call RunDefaultPaletteCommand
-	call LoadTextBoxTilePatterns
-	call GBPalNormal
-	ld hl,wd72c
-	res 1,[hl]
-	ld a,$77 ; max volume
-	ld [rNR50],a
+	ld [$fff9], a
 	ret
 
-HeightWeightText:
-	db "HT  ?",$60,"??",$61,$4E,"WT   ???lb@"
-
-; XXX does anything point to this?
-PokeText:
-	db "#@"
-
-; horizontal line that divides the pokedex text description from the rest of the data
-PokedexDataDividerLine:
-	db $68,$69,$6B,$69,$6B
-	db $69,$6B,$69,$6B,$6B
-	db $6B,$6B,$69,$6B,$69
-	db $6B,$69,$6B,$69,$6A
-	db $50
+Pokedex_PrepareDexEntryForPrinting:
+	coord hl, 0, 0
+	ld de, SCREEN_WIDTH
+	lb bc, $66, $d
+	call DrawTileLine
+	coord hl, 19, 0
+	ld b, $67
+	call DrawTileLine
+	coord hl, 0, 13
+	ld de, $1
+	lb bc, $6f, SCREEN_WIDTH
+	call DrawTileLine
+	ld a, $6c
+	Coorda 0, 13
+	ld a, $6e
+	Coorda 19, 13
+	ld a, [wPrinterPokedexEntryTextPointer]
+	ld l, a
+	ld a, [wPrinterPokedexEntryTextPointer + 1]
+	ld h, a
+	coord bc, 1, 1
+	ld a, [hFlags_0xFFFA]
+	set 3, a
+	ld [hFlags_0xFFFA], a
+	call Pokedex_PrintFlavorTextAtBC
+	ld a, [hFlags_0xFFFA]
+	res 3, a
+	ld [hFlags_0xFFFA], a
+	ret
 
 ; draws a line of tiles
 ; INPUT:
@@ -592,10 +699,10 @@ DrawTileLine:
 	push bc
 	push de
 .loop
-	ld [hl],b
-	add hl,de
+	ld [hl], b
+	add hl, de
 	dec c
-	jr nz,.loop
+	jr nz, .loop
 	pop de
 	pop bc
 	ret
@@ -606,19 +713,19 @@ PokedexToIndex:
 	; converts the Pokédex number at wd11e to an index
 	push bc
 	push hl
-	ld a,[wd11e]
-	ld b,a
-	ld c,0
-	ld hl,PokedexOrder
+	ld a, [wd11e]
+	ld b, a
+	ld c, 0
+	ld hl, PokedexOrder
 
 .loop ; go through the list until we find an entry with a matching dex number
 	inc c
-	ld a,[hli]
+	ld a, [hli]
 	cp b
-	jr nz,.loop
+	jr nz, .loop
 
-	ld a,c
-	ld [wd11e],a
+	ld a, c
+	ld [wd11e], a
 	pop hl
 	pop bc
 	ret
@@ -627,14 +734,14 @@ IndexToPokedex:
 	; converts the indexédex number at wd11e to a Pokédex number
 	push bc
 	push hl
-	ld a,[wd11e]
+	ld a, [wd11e]
 	dec a
-	ld hl,PokedexOrder
-	ld b,0
-	ld c,a
-	add hl,bc
-	ld a,[hl]
-	ld [wd11e],a
+	ld hl, PokedexOrder
+	ld b, 0
+	ld c, a
+	add hl, bc
+	ld a, [hl]
+	ld [wd11e], a
 	pop hl
 	pop bc
 	ret