From e69544b61f5014b77852567efc3b78bc56982a20 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 02:30:19 -0500 Subject: [PATCH] More Unicode --- charmap.asm | 14 +++++++------- data/battle_tower/trainer_text.asm | 12 ++++++------ data/common_text/common_text_1.asm | 6 +++--- data/common_text/common_text_3.asm | 4 ++-- data/mail_input_chars.asm | 2 +- data/phone/text/buena.asm | 4 ++-- engine/init_map.asm | 2 +- engine/load_font.asm | 4 ++-- engine/namingscreen.asm | 2 +- engine/phone/phone.asm | 4 ++-- engine/print_party.asm | 4 ++-- engine/stats_screen.asm | 2 +- engine/warp_connection.asm | 2 +- home/text.asm | 2 +- maps/AzaleaTown.asm | 4 ++-- maps/BurnedTower1F.asm | 2 +- maps/CeladonPokecenter1F.asm | 2 +- maps/CherrygroveCity.asm | 8 ++++---- maps/DragonShrine.asm | 4 ++-- maps/EcruteakHouse.asm | 2 +- maps/ElmsLab.asm | 2 +- maps/GoldenrodPokeComCenter2FMobile.asm | 4 ++-- maps/MountMoon.asm | 8 ++++---- maps/NewBarkTown.asm | 2 +- maps/RadioTower1F.asm | 4 ++-- maps/SilverCaveRoom3.asm | 8 ++++---- mobile/mobile_41.asm | 4 ++-- 27 files changed, 59 insertions(+), 59 deletions(-) diff --git a/charmap.asm b/charmap.asm index cff91542a..147ded561 100644 --- a/charmap.asm +++ b/charmap.asm @@ -19,10 +19,10 @@ charmap "@", $50 ; string terminator charmap "", $51 charmap "", $52 ; PlayerName - charmap "", $53 + charmap "", $53 ; RivalName charmap "#", $54 ; "POKé" charmap "", $55 - charmap "<......>", $56 ; "……" + charmap "<……>", $56 ; "……" charmap "", $57 charmap "", $58 charmap "", $59 @@ -53,8 +53,8 @@ charmap "ぅ", $6f ; hiragana small u, unused charmap "", $70 charmap "", $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,16 +82,16 @@ ; Actual characters (from other graphics files) ; needed for _LoadFontsExtra1 (see engine/load_font.asm) - charmap "", $60 ; gfx/font/black_arrow.2bpp + charmap "■", $60 ; gfx/font/black.2bpp charmap "▲", $61 ; gfx/font/up_arrow.png - charmap "", $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 charmap "″", $6f ; gfx/font/feet_inches.png ; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1 - charmap "", $3f ; gfx/stats/stats_tiles.png, tile 14 + charmap "⁂", $3f ; gfx/stats/stats_tiles.png, tile 14 ; Actual characters (from gfx/font/font.png) diff --git a/data/battle_tower/trainer_text.asm b/data/battle_tower/trainer_text.asm index 53af5a9e6..1601028a6 100644 --- a/data/battle_tower/trainer_text.asm +++ b/data/battle_tower/trainer_text.asm @@ -185,20 +185,20 @@ UnknownText_0x1ec3e5: ; 0x1ec3e5 ; 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 diff --git a/data/common_text/common_text_1.asm b/data/common_text/common_text_1.asm index 74fefadca..38007bc43 100644 --- a/data/common_text/common_text_1.asm +++ b/data/common_text/common_text_1.asm @@ -151,8 +151,8 @@ UnknownText_0x1bc288:: text "CARD FOLDER open.@@" UnknownText_0x1bc29c:: - text "<......><......><......><......><......><......>" - line "<......><......><......><......><......><......>" + text "<……><……><……><……><……><……>" + line "<……><……><……><……><……><……>" para "Zzz… Hm? Wha…?" line "You woke me up!" @@ -1536,7 +1536,7 @@ UnknownText_0x1bd868:: text "OK, I'll take care" line "of your money." - para "<......><......><......>" + para "<……><……><……>" prompt UnknownText_0x1bd88e:: diff --git a/data/common_text/common_text_3.asm b/data/common_text/common_text_3.asm index da5abaee8..a04432637 100644 --- a/data/common_text/common_text_3.asm +++ b/data/common_text/common_text_3.asm @@ -886,7 +886,7 @@ UnknownText_0x1c5580:: done UnknownText_0x1c5588:: - text "<......>" + text "<……>" done UnknownText_0x1c558b:: @@ -1048,7 +1048,7 @@ UnknownText_0x1c5821:: db "@@" UnknownText_0x1c5824:: - text "<......>" + text "<……>" done UnknownText_0x1c5827:: diff --git a/data/mail_input_chars.asm b/data/mail_input_chars.asm index befdc0cf7..ca3833529 100644 --- a/data/mail_input_chars.asm +++ b/data/mail_input_chars.asm @@ -14,6 +14,6 @@ MailEntry_Lowercase: ; 1224f 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 diff --git a/data/phone/text/buena.asm b/data/phone/text/buena.asm index 226839ee5..d3df60110 100644 --- a/data/phone/text/buena.asm +++ b/data/phone/text/buena.asm @@ -351,9 +351,9 @@ UnknownText_0xa1717: ; 0xa1717 para "that it gradually" line "makes me drowsy…" - para "<......> <......> <......>" + para "<……> <……> <……>" - para "<......> <......> <......>Zzz" + para "<……> <……> <……>Zzz" para "Oops, I drifted" line "off just thinking" diff --git a/engine/init_map.asm b/engine/init_map.asm index e1b6b9ab9..0ea2379d2 100644 --- a/engine/init_map.asm +++ b/engine/init_map.asm @@ -82,7 +82,7 @@ HDMATransfer_FillBGMap0WithBlack: ; 64db ld a, BANK(wDecompressScratch) ld [rSVBK], a - ld a, "" ; $60 + ld a, "■" ld hl, wDecompressScratch ld bc, wScratchAttrMap - wDecompressScratch call ByteFill diff --git a/engine/load_font.asm b/engine/load_font.asm index af64b69f6..3dd692968 100644 --- a/engine/load_font.asm +++ b/engine/load_font.asm @@ -49,11 +49,11 @@ _LoadStandardFont:: ; fb449 _LoadFontsExtra1:: ; fb48a ld de, FontsExtra_SolidBlackGFX - ld hl, vTiles2 tile "" ; $60 + ld hl, vTiles2 tile "■" ; $60 lb bc, BANK(FontsExtra_SolidBlackGFX), 1 call Get1bpp_2 ld de, PokegearPhoneIconGFX - ld hl, vTiles2 tile "" ; $62 + ld hl, vTiles2 tile "☎" ; $62 lb bc, BANK(PokegearPhoneIconGFX), 1 call Get2bpp_2 ld de, FontExtra tile 3 diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index d983d0251..0fc6e5125 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -1,6 +1,6 @@ NAMINGSCREEN_CURSOR EQU $7e -NAMINGSCREEN_BORDER EQUS "\"\"" ; $60 +NAMINGSCREEN_BORDER EQUS "\"■\"" ; $60 NAMINGSCREEN_MIDDLELINE EQUS "\"→\"" ; $eb NAMINGSCREEN_UNDERLINE EQUS "\"\"" ; $f2 diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index b2dc30dac..f402e9102 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -516,7 +516,7 @@ Phone_FirstOfTwoRings: ; 902b3 Phone_CallerTextboxWithName2: ; 902c9 call Phone_CallerTextbox hlcoord 1, 2 - ld [hl], "" + ld [hl], "☎" inc hl inc hl ld a, [PhoneScriptBank] @@ -616,7 +616,7 @@ Function90363: ; 90363 (24:4363) push bc call Phone_CallerTextbox hlcoord 1, 1 - ld [hl], "" + ld [hl], "☎" inc hl inc hl ld d, h diff --git a/engine/print_party.asm b/engine/print_party.asm index 819f38759..7c23528f3 100755 --- a/engine/print_party.asm +++ b/engine/print_party.asm @@ -153,7 +153,7 @@ PrintPartyMonPage1: ; 1dc381 call Request1bpp ld de, StatsScreenPageTilesGFX + 14 tiles ; shiny icon - ld hl, vTiles2 tile "" + ld hl, vTiles2 tile "⁂" lb bc, BANK(StatsScreenPageTilesGFX), 1 call Get2bpp @@ -332,7 +332,7 @@ Function1dc52c: ; 1dc52c farcall CheckShininess ret nc hlcoord 18, 2 - ld [hl], "" + ld [hl], "⁂" ret ; 1dc550 diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 11c3b33a3..cb677ada4 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -488,7 +488,7 @@ StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6) farcall CheckShininess ret nc hlcoord 19, 0 - ld [hl], "" + ld [hl], "⁂" ret StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index c2cb6ed10..e15809c04 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -261,7 +261,7 @@ LoadMapTimeOfDay: ; 104750 pop af ld [rVBK], a - ld a, "" + ld a, "■" ld bc, vBGMap1 - vBGMap0 hlbgcoord 0, 0 call ByteFill diff --git a/home/text.asm b/home/text.asm index d060816be..ee663527d 100644 --- a/home/text.asm +++ b/home/text.asm @@ -238,7 +238,7 @@ ENDM dict "", PlaceKougeki dict "", LineBreakChar dict "", ContText - dict "<......>", SixDotsChar + dict "<……>", SixDotsChar dict "", DoneText dict "", PromptText dict "", PlacePKMN diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 61fa44392..16889aa51 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -376,11 +376,11 @@ AzaleaTownYoungsterText: AzaleaTownSlowpokeText1: text "SLOWPOKE: …" - para "<......> <......> <......>" + para "<……> <……> <……>" done AzaleaTownSlowpokeText2: - text "<......> <......>Yawn?" + text "<……> <……>Yawn?" done WoosterText: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 4c307d710..f8e5ef52f 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -160,7 +160,7 @@ BurnedTower1FEusineMovement: step_end BurnedTowerSilver_BeforeText: - text "<......> <......> <......>" + text "<……> <……> <……>" para "…Oh, it's you." diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 9a3fa4a23..cfe31f624 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -133,7 +133,7 @@ NoBeastsText: para "#MON RAIKOU and" line "ENTEI?" - para "<......><......><......>" + para "<……><……><……>" para "Okay…" diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 5e001f445..ac3db17b6 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -433,7 +433,7 @@ GuideGentNoText: done UnknownText_0x19c4e2: - text "<......> <......> <......>" + text "<……> <……> <……>" para "You got a #MON" line "at the LAB." @@ -441,7 +441,7 @@ UnknownText_0x19c4e2: 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 @@ SilverCherrygroveWinText: done CherrygroveRivalText_YouLost: - text "<......> <......> <......>" + text "<……> <……> <……>" para "My name's ???." @@ -475,7 +475,7 @@ SilverCherrygroveLossText: done CherrygroveRivalText_YouWon: - text "<......> <......> <......>" + text "<……> <……> <……>" para "My name's ???." diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index fc1774eab..8be52840d 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -603,7 +603,7 @@ DragonShrineClairYouPassedText: para "You did fail?" - para "<......><......><......><......><......><......>" + para "<……><……><……><……><……><……>" para "…What? You passed?" done @@ -654,7 +654,7 @@ DragonShrineRisingBadgeExplanationText: done DragonShrineSpeechlessText: - text "<......><......><......><......><......><......>" + text "<……><……><……><……><……><……>" done DragonShrine_MapEvents: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 0c557274f..436bdd0e3 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -202,7 +202,7 @@ UnknownText_0x98250: line "but I must ask you" cont "to leave." - para "<......><......><......>" + para "<……><……><……>" para "Ah!" diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 12623fee2..9322aefe8 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -794,7 +794,7 @@ ElmText_GotAnEmail: text "Oh, hey! I got an" line "e-mail!" - para "<......><......><......>" + para "<……><……><……>" line "Hm… Uh-huh…" para "Okay…" diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index b8bcad2f3..b3d4a43c3 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -239,7 +239,7 @@ UnknownText_0x62b26: line "OFFICE received an" cont "e-mail. It says…" - para "<......> <......> <......>" + para "<……> <……> <……>" para "To the #COM" line "CENTER staff…" @@ -259,7 +259,7 @@ UnknownText_0x62b26: para "the world can link" line "without barriers!" - para "<......> <......> <......>" + para "<……> <……> <……>" done GoldenrodPokeComCenter2FMobile_MapEvents: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 1823757ec..38e5d436d 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -88,7 +88,7 @@ MountMoonSilverMovementAfter: step_end MountMoonSilverTextBefore: - text "<......> <......> <......>" + text "<……> <……> <……>" para "It's been a while," line "." @@ -108,7 +108,7 @@ MountMoonSilverTextBefore: done MountMoonSilverTextWin: - text "<......> <......> <......>" + text "<……> <……> <……>" para "I thought I raised" line "my #MON to be" @@ -121,7 +121,7 @@ MountMoonSilverTextWin: done MountMoonSilverTextAfter: - text "<......> <......> <......>" + text "<……> <……> <……>" para "…You won, fair" line "and square." @@ -147,7 +147,7 @@ MountMoonSilverTextAfter: done MountMoonSilverTextLoss: - text "<......> <......> <......>" + text "<……> <……> <……>" para "I've repaid my" line "debt to you." diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 9bfacc2c8..f4cad71eb 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -249,7 +249,7 @@ Text_ElmDiscoveredNewMon: done NewBarkTownRivalText1: - text "<......>" + text "<……>" para "So this is the" line "famous ELM #MON" diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 646eaae1f..96cd013c6 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -249,8 +249,8 @@ UnknownText_0x5cf5a: done UnknownText_0x5cf79: - text "<......>" - line "<......>" + text "<……>" + line "<……>" done UnknownText_0x5cf7e: diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 2fd816bda..705ca0cc1 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -37,8 +37,8 @@ Red: end .Text1: - text "<......>" - line "<......>" + text "<……>" + line "<……>" done .Text2: @@ -46,8 +46,8 @@ Red: done .Text3: - text "<......>" - line "<......>" + text "<……>" + line "<……>" done SilverCaveRoom3_MapEvents: diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index f010998f6..e51ab3eea 100755 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -1050,7 +1050,7 @@ Stubbed_Function106462: Function106464:: ; 106464 ld de, FontsExtra_SolidBlackGFX - ld hl, vTiles2 tile "" ; $60 + ld hl, vTiles2 tile "■" ; $60 lb bc, BANK(FontsExtra_SolidBlackGFX), 1 call Get2bpp ld de, FontsExtra2_UpArrowGFX @@ -1058,7 +1058,7 @@ Function106464:: ; 106464 lb bc, BANK(FontsExtra2_UpArrowGFX), 1 call Get2bpp ld de, GFX_106514 - ld hl, vTiles2 tile "" ; $62 + ld hl, vTiles2 tile "☎" ; $62 ld c, 9 ld b, BANK(GFX_106514) call Get2bpp