ref: e69544b61f5014b77852567efc3b78bc56982a20
parent: d7afa764c80310e023edee5b0f4855bfb943de34
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Thu Jan 18 21:30:19 EST 2018
More Unicode
--- a/charmap.asm
+++ b/charmap.asm
@@ -19,10 +19,10 @@
charmap "@", $50 ; string terminator
charmap "<PARA>", $51
charmap "<PLAYER>", $52 ; PlayerName
- charmap "<RIVAL>", $53
+ charmap "<RIVAL>", $53 ; RivalName
charmap "#", $54 ; "POKé"
charmap "<CONT>", $55
- charmap "<......>", $56 ; "……"
+ charmap "<……>", $56 ; "……"
charmap "<DONE>", $57
charmap "<PROMPT>", $58
charmap "<TARGET>", $59
@@ -53,8 +53,8 @@
charmap "ぅ", $6f ; hiragana small u, unused
charmap "<PO>", $70
charmap "<KE>", $71
- charmap "<``>", $72 ; opening quote
- charmap "<''>", $73 ; closing quote
+ charmap "“", $72 ; opening quote
+ charmap "”", $73 ; closing quote
charmap "·", $74 ; middle dot, unused
charmap "…", $75 ; ellipsis
charmap "ぁ", $76 ; hiragana small a, unused
@@ -82,9 +82,9 @@
; Actual characters (from other graphics files)
; needed for _LoadFontsExtra1 (see engine/load_font.asm)
- charmap "<BLACK>", $60 ; gfx/font/black_arrow.2bpp
+ charmap "■", $60 ; gfx/font/black.2bpp
charmap "▲", $61 ; gfx/font/up_arrow.png
- charmap "<PHONE>", $62 ; gfx/font/phone_icon.2bpp
+ charmap "☎", $62 ; gfx/font/phone_icon.2bpp
; needed for Special_MagikarpHouseSign (see engine/events/magikarp.asm)
charmap "′", $6e ; gfx/font/feet_inches.png
@@ -91,7 +91,7 @@
charmap "″", $6f ; gfx/font/feet_inches.png
; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1
- charmap "<SHINY>", $3f ; gfx/stats/stats_tiles.png, tile 14
+ charmap "⁂", $3f ; gfx/stats/stats_tiles.png, tile 14
; Actual characters (from gfx/font/font.png)
--- a/data/battle_tower/trainer_text.asm
+++ b/data/battle_tower/trainer_text.asm
@@ -185,20 +185,20 @@
; 0x1ec402
UnknownText_0x1ec402: ; 0x1ec402
- text "<......><......><......>"
- line "<......><......>Battle?"
+ text "<……><……><……>"
+ line "<……><……>Battle?"
done
; 0x1ec411
UnknownText_0x1ec411: ; 0x1ec411
- text "<......><......><......>"
- line "<......><......>I won?"
+ text "<……><……><……>"
+ line "<……><……>I won?"
done
; 0x1ec41f
UnknownText_0x1ec41f: ; 0x1ec41f
- text "<......><......><......>"
- line "<......><......>I lost?"
+ text "<……><……><……>"
+ line "<……><……>I lost?"
done
; 0x1ec42e
--- a/data/common_text/common_text_1.asm
+++ b/data/common_text/common_text_1.asm
@@ -151,8 +151,8 @@
text "CARD FOLDER open.@@"
UnknownText_0x1bc29c::
- text "<......><......><......><......><......><......>"
- line "<......><......><......><......><......><......>"
+ text "<……><……><……><……><……><……>"
+ line "<……><……><……><……><……><……>"
para "Zzz… Hm? Wha…?"
line "You woke me up!"
@@ -1536,7 +1536,7 @@
text "OK, I'll take care"
line "of your money."
- para "<......><......><......>"
+ para "<……><……><……>"
prompt
UnknownText_0x1bd88e::
--- a/data/common_text/common_text_3.asm
+++ b/data/common_text/common_text_3.asm
@@ -886,7 +886,7 @@
done
UnknownText_0x1c5588::
- text "<......>"
+ text "<……>"
done
UnknownText_0x1c558b::
@@ -1048,7 +1048,7 @@
db "@@"
UnknownText_0x1c5824::
- text "<......>"
+ text "<……>"
done
UnknownText_0x1c5827::
--- a/data/mail_input_chars.asm
+++ b/data/mail_input_chars.asm
@@ -14,6 +14,6 @@
db "k l m n o p q r s t"
db "u v w x y z . - /"
db "'d 'l 'm 'r 's 't 'v & ( )"
- db "<``> <''> [ ] ' : ; "
+ db "“ ” [ ] ' : ; "
db "UPPER DEL END "
; 122c1
--- a/data/phone/text/buena.asm
+++ b/data/phone/text/buena.asm
@@ -351,9 +351,9 @@
para "that it gradually"
line "makes me drowsy…"
- para "<......> <......> <......>"
+ para "<……> <……> <……>"
- para "<......> <......> <......>Zzz"
+ para "<……> <……> <……>Zzz"
para "Oops, I drifted"
line "off just thinking"
--- a/engine/init_map.asm
+++ b/engine/init_map.asm
@@ -82,7 +82,7 @@
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
- ld a, "<BLACK>" ; $60
+ ld a, "■"
ld hl, wDecompressScratch
ld bc, wScratchAttrMap - wDecompressScratch
call ByteFill
--- a/engine/load_font.asm
+++ b/engine/load_font.asm
@@ -49,11 +49,11 @@
_LoadFontsExtra1:: ; fb48a
ld de, FontsExtra_SolidBlackGFX
- ld hl, vTiles2 tile "<BLACK>" ; $60
+ ld hl, vTiles2 tile "■" ; $60
lb bc, BANK(FontsExtra_SolidBlackGFX), 1
call Get1bpp_2
ld de, PokegearPhoneIconGFX
- ld hl, vTiles2 tile "<PHONE>" ; $62
+ ld hl, vTiles2 tile "☎" ; $62
lb bc, BANK(PokegearPhoneIconGFX), 1
call Get2bpp_2
ld de, FontExtra tile 3
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -1,6 +1,6 @@
NAMINGSCREEN_CURSOR EQU $7e
-NAMINGSCREEN_BORDER EQUS "\"<BLACK>\"" ; $60
+NAMINGSCREEN_BORDER EQUS "\"■\"" ; $60
NAMINGSCREEN_MIDDLELINE EQUS "\"→\"" ; $eb
NAMINGSCREEN_UNDERLINE EQUS "\"<DOT>\"" ; $f2
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -516,7 +516,7 @@
Phone_CallerTextboxWithName2: ; 902c9
call Phone_CallerTextbox
hlcoord 1, 2
- ld [hl], "<PHONE>"
+ ld [hl], "☎"
inc hl
inc hl
ld a, [PhoneScriptBank]
@@ -616,7 +616,7 @@
push bc
call Phone_CallerTextbox
hlcoord 1, 1
- ld [hl], "<PHONE>"
+ ld [hl], "☎"
inc hl
inc hl
ld d, h
--- a/engine/print_party.asm
+++ b/engine/print_party.asm
@@ -153,7 +153,7 @@
call Request1bpp
ld de, StatsScreenPageTilesGFX + 14 tiles ; shiny icon
- ld hl, vTiles2 tile "<SHINY>"
+ ld hl, vTiles2 tile "⁂"
lb bc, BANK(StatsScreenPageTilesGFX), 1
call Get2bpp
@@ -332,7 +332,7 @@
farcall CheckShininess
ret nc
hlcoord 18, 2
- ld [hl], "<SHINY>"
+ ld [hl], "⁂"
ret
; 1dc550
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -488,7 +488,7 @@
farcall CheckShininess
ret nc
hlcoord 19, 0
- ld [hl], "<SHINY>"
+ ld [hl], "⁂"
ret
StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
--- a/engine/warp_connection.asm
+++ b/engine/warp_connection.asm
@@ -261,7 +261,7 @@
pop af
ld [rVBK], a
- ld a, "<BLACK>"
+ ld a, "■"
ld bc, vBGMap1 - vBGMap0
hlbgcoord 0, 0
call ByteFill
--- a/home/text.asm
+++ b/home/text.asm
@@ -238,7 +238,7 @@
dict "<KOUGEKI>", PlaceKougeki
dict "<LNBRK>", LineBreakChar
dict "<CONT>", ContText
- dict "<......>", SixDotsChar
+ dict "<……>", SixDotsChar
dict "<DONE>", DoneText
dict "<PROMPT>", PromptText
dict "<PKMN>", PlacePKMN
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -376,11 +376,11 @@
AzaleaTownSlowpokeText1:
text "SLOWPOKE: …"
- para "<......> <......> <......>"
+ para "<……> <……> <……>"
done
AzaleaTownSlowpokeText2:
- text "<......> <......>Yawn?"
+ text "<……> <……>Yawn?"
done
WoosterText:
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -160,7 +160,7 @@
step_end
BurnedTowerSilver_BeforeText:
- text "<......> <......> <......>"
+ text "<……> <……> <……>"
para "…Oh, it's you."
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -133,7 +133,7 @@
para "#MON RAIKOU and"
line "ENTEI?"
- para "<......><......><......>"
+ para "<……><……><……>"
para "Okay…"
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -433,7 +433,7 @@
done
UnknownText_0x19c4e2:
- text "<......> <......> <......>"
+ text "<……> <……> <……>"
para "You got a #MON"
line "at the LAB."
@@ -441,7 +441,7 @@
para "What a waste."
line "A wimp like you."
- para "<......> <......> <......>"
+ para "<……> <……> <……>"
para "Don't you get what"
line "I'm saying?"
@@ -459,7 +459,7 @@
done
CherrygroveRivalText_YouLost:
- text "<......> <......> <......>"
+ text "<……> <……> <……>"
para "My name's ???."
@@ -475,7 +475,7 @@
done
CherrygroveRivalText_YouWon:
- text "<......> <......> <......>"
+ text "<……> <……> <……>"
para "My name's ???."
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -603,7 +603,7 @@
para "You did fail?"
- para "<......><......><......><......><......><......>"
+ para "<……><……><……><……><……><……>"
para "…What? You passed?"
done
@@ -654,7 +654,7 @@
done
DragonShrineSpeechlessText:
- text "<......><......><......><......><......><......>"
+ text "<……><……><……><……><……><……>"
done
DragonShrine_MapEvents:
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -202,7 +202,7 @@
line "but I must ask you"
cont "to leave."
- para "<......><......><......>"
+ para "<……><……><……>"
para "Ah!"
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -794,7 +794,7 @@
text "Oh, hey! I got an"
line "e-mail!"
- para "<......><......><......>"
+ para "<……><……><……>"
line "Hm… Uh-huh…"
para "Okay…"
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -239,7 +239,7 @@
line "OFFICE received an"
cont "e-mail. It says…"
- para "<......> <......> <......>"
+ para "<……> <……> <……>"
para "To the #COM"
line "CENTER staff…"
@@ -259,7 +259,7 @@
para "the world can link"
line "without barriers!"
- para "<......> <......> <......>"
+ para "<……> <……> <……>"
done
GoldenrodPokeComCenter2FMobile_MapEvents:
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -88,7 +88,7 @@
step_end
MountMoonSilverTextBefore:
- text "<......> <......> <......>"
+ text "<……> <……> <……>"
para "It's been a while,"
line "<PLAYER>."
@@ -108,7 +108,7 @@
done
MountMoonSilverTextWin:
- text "<......> <......> <......>"
+ text "<……> <……> <……>"
para "I thought I raised"
line "my #MON to be"
@@ -121,7 +121,7 @@
done
MountMoonSilverTextAfter:
- text "<......> <......> <......>"
+ text "<……> <……> <……>"
para "…You won, fair"
line "and square."
@@ -147,7 +147,7 @@
done
MountMoonSilverTextLoss:
- text "<......> <......> <......>"
+ text "<……> <……> <……>"
para "I've repaid my"
line "debt to you."
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -249,7 +249,7 @@
done
NewBarkTownRivalText1:
- text "<......>"
+ text "<……>"
para "So this is the"
line "famous ELM #MON"
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -249,8 +249,8 @@
done
UnknownText_0x5cf79:
- text "<......>"
- line "<......>"
+ text "<……>"
+ line "<……>"
done
UnknownText_0x5cf7e:
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -37,8 +37,8 @@
end
.Text1:
- text "<......>"
- line "<......>"
+ text "<……>"
+ line "<……>"
done
.Text2:
@@ -46,8 +46,8 @@
done
.Text3:
- text "<......>"
- line "<......>"
+ text "<……>"
+ line "<……>"
done
SilverCaveRoom3_MapEvents:
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -1050,7 +1050,7 @@
Function106464:: ; 106464
ld de, FontsExtra_SolidBlackGFX
- ld hl, vTiles2 tile "<BLACK>" ; $60
+ ld hl, vTiles2 tile "■" ; $60
lb bc, BANK(FontsExtra_SolidBlackGFX), 1
call Get2bpp
ld de, FontsExtra2_UpArrowGFX
@@ -1058,7 +1058,7 @@
lb bc, BANK(FontsExtra2_UpArrowGFX), 1
call Get2bpp
ld de, GFX_106514
- ld hl, vTiles2 tile "<PHONE>" ; $62
+ ld hl, vTiles2 tile "☎" ; $62
ld c, 9
ld b, BANK(GFX_106514)
call Get2bpp