Feet+inch marks are standard characters too

5 files changed, 37 insertions, 20 deletions

diff --git a/Expand-tilesets-from-192-to-255-tiles.md b/Expand-tilesets-from-192-to-255-tiles.md
index 72255b8..f7abbae 100644
--- a/Expand-tilesets-from-192-to-255-tiles.md
+++ b/Expand-tilesets-from-192-to-255-tiles.md
@@ -92,18 +92,15 @@ Edit [charmap.asm](../blob/master/charmap.asm):
 
  ; Actual characters (from other graphics files)
 
-+	charmap " ",         $7f ; gfx/frames/space.png
-+
 -	; needed for _LoadFontsExtra1 (see engine/load_font.asm)
 -	charmap "■",         $60 ; gfx/font/black.2bpp
 -	charmap "▲",         $61 ; gfx/font/up_arrow.png
 -	charmap "☎",         $62 ; gfx/font/phone_icon.2bpp
 -
- 	; needed for MagikarpHouseSign (see engine/events/magikarp.asm)
+-	; needed for MagikarpHouseSign (see engine/events/magikarp.asm)
 -	charmap "′",         $6e ; gfx/font/feet_inches.png
 -	charmap "″",         $6f ; gfx/font/feet_inches.png
-+	charmap "′",         $da ; gfx/font/feet_inches.png
-+	charmap "″",         $db ; gfx/font/feet_inches.png
++	charmap " ",         $7f ; gfx/frames/space.png
 
  	; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1
  	charmap "⁂",         $3f ; gfx/stats/stats_tiles.png, tile 14
@@ -122,6 +119,9 @@ Edit [charmap.asm](../blob/master/charmap.asm):
 +	charmap "│",         $bd
 +	charmap "└",         $be
 +	charmap "┘",         $bf
++
++	charmap "′",         $ce
++	charmap "″",         $cf
 
 	charmap "'d",        $d0
 	charmap "'l",        $d1
@@ -296,7 +296,7 @@ And edit [mobile/mobile_41.asm](../blob/master/mobile/mobile_41.asm):
 
 ## 4. Delete the unused font graphics
 
-Delete [gfx/font/font_extra.png](../blob/master/gfx/font/font_extra.png), [gfx/font/phone_icon.png](../blob/master/gfx/font/phone_icon.png), [gfx/font/black.png](../blob/master/gfx/font/black.png), and [gfx/font/up_arrow.png](../blob/master/gfx/font/up_arrow.png).
+Delete [gfx/font/font_extra.png](../blob/master/gfx/font/font_extra.png), [gfx/font/phone_icon.png](../blob/master/gfx/font/phone_icon.png), [gfx/font/black.png](../blob/master/gfx/font/black.png), [gfx/font/up_arrow.png](../blob/master/gfx/font/up_arrow.png), and [gfx/font/feet_inches.png](../blob/master/gfx/font/feet_inches.png).
 
 Edit [gfx/font.asm](../blob/master/gfx/font.asm):
 
@@ -320,7 +320,35 @@ Edit [gfx/font.asm](../blob/master/gfx/font.asm):
 -INCBIN "gfx/font/up_arrow.2bpp"
 ```
 
-This is not strictly necessary, but it will save space in the ROM, and avoid confusion from wondering why changes to those files don't affect the game.
+Edit [engine/events/magikarp.asm](../blob/master/engine/events/magikarp.asm):
+
+```diff
+-Magikarp_LoadFeetInchesChars:
+-	ld hl, vTiles2 tile "′" ; $6e
+-	ld de, .feetinchchars
+-	lb bc, BANK(.feetinchchars), 2
+-	call Request2bpp
+-	ret
+-
+-.feetinchchars
+-INCBIN "gfx/font/feet_inches.2bpp"
+-
+ PrintMagikarpLength:
+-	call Magikarp_LoadFeetInchesChars
+ 	ld hl, wStringBuffer1
+ 	ld de, wMagikarpLength
+ 	lb bc, PRINTNUM_RIGHTALIGN | 1, 2
+ 	call PrintNum
+ 	ld [hl], "′"
+ 	inc hl
+ 	ld de, wMagikarpLength + 1
+ 	lb bc, PRINTNUM_RIGHTALIGN | 1, 2
+ 	call PrintNum
+ 	ld [hl], "″"
+ 	inc hl
+ 	ld [hl], "@"
+ 	ret
+```
 
 
 ## 5. Load tile graphics into $60–$7F and $E0–$FF
@@ -498,18 +526,6 @@ Edit [engine/events/map_name_sign.asm](../blob/master/engine/events/map_name_sig
  	ret
 ```
 
-Edit [engine/events/magikarp.asm](../blob/master/engine/events/magikarp.asm):
-
-```diff
- Magikarp_LoadFeetInchesChars:
--	ld hl, vTiles2 tile "′" ; $6e
-+	ld hl, vTiles0 tile "′" ; $da
- 	ld de, .feetinchchars
- 	lb bc, BANK(.feetinchchars), 2
- 	call Request2bpp
- 	ret
-```
-
 Edit [engine/events/halloffame.asm](../blob/master/engine/events/halloffame.asm):
 
 ```diff
@@ -623,7 +639,7 @@ Remember, tile $7F is reserved for the space character, so don't use it for a ma
 
 This entire change is compatible with [adding `PRIORITY` colors so NPCs can walk behind tiles](Allow-map-tiles-to-appear-above-sprites-\(so-NPCs-can-walk-behind-tiles\)-with-PRIORITY-colors); in [step 7](#7-update-the-tilesets-palette-maps-to-not-skip-607f), you'll just be removing a `rept 32` instead of a `rept 16`.
 
-Note that tiles $C0–$CD are blank in the font graphics, but get overwritten by the popup map name sign tiles. It's still okay to use them for your own text characters ("É", "¿", "♪", "♥", etc), just don't use those tiles in any map names. Tiles $CE and $CF are completely unused.
+Note that tiles $C0–$CD are blank in the font graphics, but get overwritten by the popup map name sign tiles. It's still okay to use them for your own text characters ("É", "¿", "♪", "♥", etc), just don't use those tiles in any map names.
 
 You can also easily get rid of some rarely-used characters if you need more font space:
 
@@ -632,4 +648,5 @@ You can also easily get rid of some rarely-used characters if you need more font
 - "`<COLON>`" is only used twice (see [engine/menus/intro_menu.asm](../blob/master/engine/menus/intro_menu.asm) and [engine/events/halloffame.asm](../blob/master/engine/events/halloffame.asm)), which could instead use plain ":"
 - The arrows "←" and "→" are only used for the Unown printer (see [engine/events/print_unown.asm](../blob/master/engine/events/print_unown.asm))
 - The phone icon "☎" is only used for the Pokégear phone alert (see [engine/phone/phone.asm](../blob/master/engine/phone/phone.asm))
+- "′" and "″" are only used for the Magikarp length record (see [engine/events/magikarp.asm](../blob/master/engine/events/magikarp.asm)).
 - "`<PO>`" and "`<KE>`" are only used for mail input (see [data/text/mail_input_chars.asm](../blob/master/data/text/mail_input_chars.asm)) and to define "`<POKE>`", which is itself only used for the Pokégear name (see [engine/menus/start_menu.asm](../blob/master/engine/menus/start_menu.asm))
diff --git a/screenshots/255-tiles-vram.png b/screenshots/255-tiles-vram.png
index ae95f5c..73bdf23 100644
--- a/screenshots/255-tiles-vram.png
+++ b/screenshots/255-tiles-vram.png
diff --git a/screenshots/255-tiles_gfx-font-font.png b/screenshots/255-tiles_gfx-font-font.png
index 7cb4b6e..df3aa21 100644
--- a/screenshots/255-tiles_gfx-font-font.png
+++ b/screenshots/255-tiles_gfx-font-font.png
diff --git a/screenshots/255-tiles_gfx-font-font_inversed.png b/screenshots/255-tiles_gfx-font-font_inversed.png
index 1b10dbd..c5f4940 100644
--- a/screenshots/255-tiles_gfx-font-font_inversed.png
+++ b/screenshots/255-tiles_gfx-font-font_inversed.png
diff --git a/screenshots/255-tiles_gfx-font-overworld.png b/screenshots/255-tiles_gfx-font-overworld.png
index 6b8ab1e..dbcbd82 100644
--- a/screenshots/255-tiles_gfx-font-overworld.png
+++ b/screenshots/255-tiles_gfx-font-overworld.png