More Japanese characters

This commit is contained in:
Remy Oukaour 2018-01-19 20:48:33 -05:00
parent b199f6cfbf
commit ddec0ee305
14 changed files with 75 additions and 46 deletions

View File

@ -215,6 +215,7 @@ gfx/sgb/sgb_border.2bpp: tools/gfx += --trim-whitespace
gfx/mobile/ascii_font.2bpp: tools/gfx += --trim-whitespace
gfx/mobile/electro_ball.2bpp: tools/gfx += --trim-whitespace
gfx/mobile/electro_ball_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip
gfx/mobile/mobile_adapter.2bpp: tools/gfx += --trim-whitespace
gfx/mobile/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip
gfx/mobile/pichu_animated.2bpp: tools/gfx += --trim-whitespace

View File

@ -73,7 +73,7 @@
charmap "<LV>", $6e
charmap "<ど>", $70 ; hiragana small do, unused
charmap "<DO>", $70 ; hiragana small do, unused
charmap "◀", $71
charmap "『", $72 ; Japanese opening quote, unused
charmap "<ID>", $73
@ -208,7 +208,7 @@
; Japanese control characters (see home/text.asm)
charmap "<CTRL_18>", $18 ; "ノ゛"? (ungrammatical)
charmap "<JP_18>", $18 ; "ノ゛"? (ungrammatical)
charmap "<NI>", $1d ; "に "
charmap "<TTE>", $1e ; "って"
charmap "<WO>", $1f ; "を "
@ -276,11 +276,18 @@
charmap "ぺ", $47
charmap "ぽ", $48
charmap "「", $70
charmap "」", $71
charmap "』", $73
charmap "⋯", $75
charmap " ", $7f
charmap "ア", $80
charmap "イ", $81
charmap "ウ", $82
charmap "エ", $83
charmap "ォ", $84
charmap "", $84
charmap "カ", $85
charmap "キ", $86
charmap "ク", $87
@ -331,7 +338,6 @@
charmap "う", $b3
charmap "え", $b4
charmap "お", $b5
charmap "か", $b6
charmap "き", $b7
charmap "く", $b8
@ -357,7 +363,6 @@
charmap "ふ", $cc
charmap "へ", $cd
charmap "ほ", $ce
charmap "ま", $cf
charmap "み", $d0
charmap "む", $d1
@ -380,8 +385,31 @@
charmap "ょ", $e2
charmap "ー", $e3
charmap "゚", $e4
charmap "゙", $e5
charmap "", $e6
charmap "", $e7
charmap "。", $e8
charmap "ァ", $e9
charmap "ゥ", $ea
charmap "ェ", $eb
charmap "円", $f0
charmap "", $f2
charmap "", $f3
charmap "ォ", $f4
charmap "", $f6
charmap "", $f7
charmap "", $f8
charmap "", $f9
charmap "", $fa
charmap "", $fb
charmap "", $fc
charmap "", $fd
charmap "", $fe
charmap "", $ff

View File

@ -128,7 +128,7 @@ CreditsStrings:
.NobuhiroSeya: db " NOBUHIRO SEYA@" ; "せや のぶひろ@"
.KazuhitoSekine: db " KAZUHITO SEKINE@" ; "せきね かずひと@"
.TetsujiOota: db " TETSUJI OOTA@" ; "おおた てつじ@"
.NclSuperMarioClub: db "NCL SUPER MARIO CLUB@" ; "スーパーマりクラブ@"
.NclSuperMarioClub: db "NCL SUPER MARIO CLUB@" ; "スーパーマりクラブ@"
.Sarugakucho: db " SARUGAKUCHO@" ; "さるがくちょう@"
.AkitoMori: db " AKITO MORI@" ; "もり あきと@"
.TakahiroHarada: db " TAKAHIRO HARADA@" ; "はらだ たかひろ@"
@ -190,7 +190,7 @@ CreditsStrings:
.Music: db " MUSIC@" ; "おんがく@"
.SoundEffects: db " SOUND EFFECTS@" ; "サウンド エフ→クト@"
.GameDesign: db " GAME DESIGN@" ; "ゲームデザイン@"
.GameScenario: db " GAME SCENARIO@" ; "シナり@"
.GameScenario: db " GAME SCENARIO@" ; "シナり@"
.ToolProgramming: db " TOOL PROGRAMMING@" ; "ツール プログラム@"
.ParametricDesign: db " PARAMETRIC DESIGN@" ; "パラメーター せってい@"
.ScriptDesign: db " SCRIPT DESIGN@" ; "スクりプト せってい@"

View File

@ -56,14 +56,14 @@ Gen1TrainerClassNames: ; 50a42
.Pokemaniac: db "マニア@"
.SuperNerd: db "りかけい@"
.Burglar: db "どろぼう@"
.Engineer: db "ヤジ@"
.Engineer: db "ヤジ@"
.Jack: db "ジャック@"
.Swimmer: db "かいパン@"
.Beauty: db "おねえさん@"
.Rocker: db "グループ@"
.Juggler: db "ジャグラー@"
.Blackbelt: db "からて@"
.ProfOak: db "ーキド@"
.ProfOak: db "ーキド@"
.Chief: db "チーフ@"
.Scientist: db "けんきゅういん@"
.Rocket: db "だんいん@"

View File

@ -384,7 +384,7 @@ Function81adb: ; 81adb
ret
; 81baf
String_81baf: db "レアぅぅ@" ; rare (shiny)
String_81baf: db "レア", DEBUGTEST_BLACK, DEBUGTEST_BLACK, "@" ; rare (shiny)
String_81bb4: db "ノーマル@" ; normal
String_81bb9: db DEBUGTEST_A, "きりかえ▶@" ; (A) switches
; 81bc0

View File

@ -56,7 +56,7 @@ LinkTextbox2: ; 4d35b
.PlaceBorder: ; 4d37e
push hl
ld a, "ぁ" ; $76
ld a, $76
ld [hli], a
inc a
call .PlaceRow

View File

@ -139,7 +139,7 @@ _LoadTradeScreenBorder: ; 16d696
LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a
ld de, LinkCommsBorderGFX + $30 tiles
ld hl, vTiles2 tile "ぁ"
ld hl, vTiles2 tile $76
lb bc, BANK(LinkCommsBorderGFX), 8
call Get2bpp
ret

View File

@ -56,7 +56,7 @@ _LoadFontsExtra1:: ; fb48a
ld hl, vTiles2 tile "☎" ; $62
lb bc, BANK(PokegearPhoneIconGFX), 1
call Get2bpp_2
ld de, FontExtra tile 3
ld de, FontExtra + 3 tiles ; "<BOLD_D>"
ld hl, vTiles2 tile "<BOLD_D>"
lb bc, BANK(FontExtra), 22 ; "<BOLD_D>" to "ぉ"
call Get2bpp_2
@ -104,8 +104,8 @@ LoadBattleFontsHPBar: ; fb4f2
lb bc, BANK(FontBattleExtra), 12
call Get2bpp_2
ld hl, vTiles2 tile $70
ld de, FontBattleExtra tile 16
lb bc, BANK(FontBattleExtra), 3 ; "<>" to "『"
ld de, FontBattleExtra + 16 tiles ; "<DO>"
lb bc, BANK(FontBattleExtra), 3 ; "<DO>" to "『"
call Get2bpp_2
call LoadFrame
@ -122,7 +122,7 @@ LoadHPBar: ; fb50d
ld hl, vTiles2 tile $55
lb bc, BANK(ExpBarGFX), 9
call Get2bpp_2
ld de, MobilePhoneTilesGFX tile 7 ; mobile phone icon
ld de, MobilePhoneTilesGFX + 7 tiles ; mobile phone icon
ld hl, vTiles2 tile $5e
lb bc, BANK(MobilePhoneTilesGFX), 2
call Get2bpp_2

View File

@ -65,7 +65,7 @@ CheckNickErrors:: ; 669f
; format:
; ≥ <
db TX_START, TX_BOX + 1
db "<PLAY_G>", "<CTRL_18>" + 1
db "<PLAY_G>", "<JP_18>" + 1
db "<NI>", "<NO>" + 1
db "<ROUTE>", "<GREEN>" + 1
db "<ENEMY>", "<ENEMY>" + 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -2054,13 +2054,13 @@ String_11cdc7: ; 11cdc7
String_11cdd9: ; 11cdd9
; Words will be displayed in alphabetical order
db "ことば¯アイウエ の"
db "ことば¯アイウエ の"
next "じゅんばんで ひょうじ します@"
; 11cdf5
String_11cdf5: ; 11cdf5
db "しゅるいべつ モード" ; Category mode
next "アイウエ モード@" ; ABC mode
next "アイウエ モード@" ; ABC mode
; 11ce0b
Function11ce0b: ; 11ce0b (47:4e0b)
@ -3601,7 +3601,7 @@ MobileEZChatCategoryPointers: ; 11daac
db "ラララ@@", $98, $5, $0
db "わーい@@", $ac, $5, $0
db "わーん!!", $b0, $5, $0
db "ワ@@@", $b2, $5, $0
db "ワ@@@", $b2, $5, $0
db "わっ!!@", $ce, $5, $0
db "わははは!", $d0, $5, $0
@ -3683,7 +3683,7 @@ MobileEZChatCategoryPointers: ; 11daac
db "エキサイト", $d8, $0, $0
db "えらい@@", $de, $0, $0
db "おかしい@", $ec, $0, $0
db "ッケー@", $8, $1, $0
db "ッケー@", $8, $1, $0
db "かえりたい", $48, $1, $0
db "がっくし@", $5a, $1, $0
db "かなしい@", $6c, $1, $0
@ -3850,7 +3850,7 @@ MobileEZChatCategoryPointers: ; 11daac
db "もようがえ", $3a, $5, $0
db "ゆめ@@@", $5a, $5, $0
db "ようちえん", $66, $5, $0
db "ラジ@@", $92, $5, $0
db "ラジ@@", $92, $5, $0
db "ワールド@", $ae, $5, $0
.Hobbies: ; 11ea58

View File

@ -556,13 +556,13 @@ INCBIN "gfx/unknown/08940b.2bpp"
Function8942b: ; 8942b (22:542b)
ld de, vTiles0 tile $02
ld hl, MobileAdapterGFX + $7d0
ld bc, $80
ld hl, MobileAdapterGFX + $7d tiles
ld bc, 8 tiles
ld a, BANK(MobileAdapterGFX)
call FarCopyBytes
ld de, vTiles0 tile $0a
ld hl, MobileAdapterGFX + $c60
ld bc, $40
ld hl, MobileAdapterGFX + $c6 tiles
ld bc, 4 tiles
ld a, BANK(MobileAdapterGFX)
call FarCopyBytes
ret
@ -581,9 +581,9 @@ Function89448: ; 89448 (22:5448)
ret
Function89455: ; 89455 (22:5455)
ld hl, MobileAdapterGFX + $7d0
ld hl, MobileAdapterGFX + $7d tiles
ld de, vTiles2 tile $0c
ld bc, $490
ld bc, $49 tiles
ld a, BANK(MobileAdapterGFX)
call FarCopyBytes
ret
@ -591,12 +591,12 @@ Function89455: ; 89455 (22:5455)
Function89464: ; 89464
ld hl, MobileAdapterGFX
ld de, vTiles2
ld bc, $200
ld bc, $20 tiles
ld a, BANK(MobileAdapterGFX)
call FarCopyBytes
ld hl, MobileAdapterGFX + $660
ld hl, MobileAdapterGFX + $66 tiles
ld de, vTiles2 tile $20
ld bc, $170
ld bc, $17 tiles
ld a, BANK(MobileAdapterGFX)
call FarCopyBytes
ret
@ -1267,15 +1267,15 @@ Function897d5: ; 897d5
Function89807: ; 89807 (22:5807)
ld hl, MobileAdapterGFX + $200
ld hl, MobileAdapterGFX + $20 tiles
ld a, [wPlayerGender]
bit 0, a
jr z, .asm_89814
ld hl, MobileAdapterGFX + $200 + $230
ld hl, MobileAdapterGFX + $43 tiles
.asm_89814
call DisableLCD
ld de, vTiles2 tile $37
ld bc, $230
ld bc, $23 tiles
ld a, BANK(MobileAdapterGFX)
call FarCopyBytes
call EnableLCD

View File

@ -6003,7 +6003,7 @@ MenuDataHeader_11ae38: ; 11ae38
String_11ae40: ; 11ae40
db "どちらでも"
next "♂ス"
next "♂ス"
next "♀メス"
db "@"
; 11ae4e
@ -6338,7 +6338,7 @@ Function11b03d: ; 11b03d
ret
; 11b07a
.MaleString: db "スの "
.MaleString: db "スの "
.FemaleString: db "メスの "
Function11b082: ; 11b082

View File

@ -240,7 +240,7 @@ CheckStringForErrors_IgnoreTerminator: ; 17d0b3
jr c, .end
cp "<PLAY_G>"
jr c, .next
cp "<CTRL_18>" + 1
cp "<JP_18>" + 1
jr c, .end
cp "<NI>"
jr c, .next