From 2acaa96cf16ce953a7149f300d54e5440abc27d8 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Thu, 18 Jan 2018 18:34:20 -0500
Subject: More charmap and home/text.asm documentation for JP chars

---
 engine/map_objects.asm              | 4 +++-
 engine/radio.asm                    | 4 ++--
 engine/routines/checknickerrors.asm | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'engine')

diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index 30407c64d..00ce599e3 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -2474,8 +2474,10 @@ Function56cd: ; 56cd
 	push bc
 	call Coord2Tile
 	pop bc
+; NPCs disappear if standing on tile $60-$7f (or $e0-$ff),
+; since those IDs are for text characters and textbox frames.
 	ld a, [hl]
-	cp MAPOBJECT_VISIBLE_TILE_LIMIT
+	cp FIRST_REGULAR_TEXT_CHAR
 	jr nc, .nope
 .ok8
 	dec d
diff --git a/engine/radio.asm b/engine/radio.asm
index bfc95404e..54da69255 100644
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -134,7 +134,7 @@ PrintRadioLine:
 	cp 2
 	jr nc, .print
 	inc hl
-	ld [hl], "<START>"
+	ld [hl], TX_START
 	inc a
 	ld [wNumRadioLinesPrinted], a
 	cp 2
@@ -813,7 +813,7 @@ CopyDexEntryPart1:
 	ld bc, SCREEN_WIDTH - 1
 	call FarCopyBytes
 	ld hl, wPokedexShowPointerAddr
-	ld [hl], "<START>"
+	ld [hl], TX_START
 	inc hl
 	ld [hl], "<LINE>"
 	inc hl
diff --git a/engine/routines/checknickerrors.asm b/engine/routines/checknickerrors.asm
index 1cedca420..65efd7b94 100644
--- a/engine/routines/checknickerrors.asm
+++ b/engine/routines/checknickerrors.asm
@@ -64,10 +64,10 @@ CheckNickErrors:: ; 669f
 ; table defining which characters are actually text commands
 ; format:
 	;      ≥           <
-	db "<START>",  TX_BOX    + 1
+	db TX_START,   TX_BOX    + 1
 	db "<PLAY_G>", $18       + 1
-	db $1d,        "%"       + 1
-	db $35,        "<GREEN>" + 1
+	db "<NI>",     "%"       + 1
+	db "<ROUTE>",  "<GREEN>" + 1
 	db "<ENEMY>",  "<ENEMY>" + 1
 	db "<MOM>",    "<TM>"    + 1
 	db "<ROCKET>", "┘"       + 1
-- 
cgit v1.2.3