aboutsummaryrefslogtreecommitdiffstats
path: root/engine/pokemon/status_screen.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-05 19:58:21 -0400
committerGitHub <noreply@github.com>2020-07-05 19:58:21 -0400
commitc57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch)
tree531d6b30d5a606ae963024825ed6e614843000a6 /engine/pokemon/status_screen.asm
parentMerge pull request #257 from Rangi42/master (diff)
parentdb $f6 == script_cable_club_receptionist (diff)
downloadpokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.gz
pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.xz
pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.zip
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'engine/pokemon/status_screen.asm')
-rwxr-xr-xengine/pokemon/status_screen.asm21
1 files changed, 12 insertions, 9 deletions
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm
index b262a8b7..35cc9502 100755
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -110,7 +110,7 @@ StatusScreen:
call DrawLineBox ; Draws the box around name, HP and status
ld de, -6
add hl, de
- ld [hl], "⠄" ; . after No ("." is a different one)
+ ld [hl], "<DOT>"
dec hl
ld [hl], "№"
coord hl, 19, 9
@@ -205,14 +205,17 @@ NamePointers2:
dw wDayCareMonName
Type1Text:
- db "TYPE1/", $4e
-
+ db "TYPE1/"
+ next ""
+ ; fallthrough
Type2Text:
- db "TYPE2/", $4e
-
+ db "TYPE2/"
+ next ""
+ ; fallthrough
IDNoText:
- db $73, "№/", $4e
-
+ db "<ID>№/"
+ next ""
+ ; fallthrough
OTText:
db "OT/"
next "@"
@@ -328,7 +331,7 @@ StatusScreen2:
ld b, a ; Number of moves ?
coord hl, 11, 10
ld de, SCREEN_WIDTH * 2
- ld a, $72 ; special P tile id
+ ld a, "<BOLD_P>"
call StatusScreen_PrintPP ; Print "PP"
ld a, b
and a
@@ -399,7 +402,7 @@ StatusScreen2:
ld [wLoadedMonLevel], a ; Increase temporarily if not 100
.Level100
coord hl, 14, 6
- ld [hl], $70 ; 1-tile "to"
+ ld [hl], "<to>"
inc hl
inc hl
call PrintLevel