Remove Japanese text and non-english fonts (#1), Expand tilesets from 192 to 255 tiles (#2) [Commit 1]

charmap.asm

@@ -3,7 +3,6 @@
 ; Control characters (see home/text.asm)
 
 	charmap "<NULL>",    $00
-	charmap "<PLAY_G>",  $14 ; "<PLAYER>くん" or "<PLAYER>ちゃん"; same as "<PLAYER>" in English
 	charmap "<MOBILE>",  $15
 	charmap "<CR>",      $16
 	charmap "¯",         $1f ; soft linebreak
@@ -38,31 +37,31 @@
 
 ; Actual characters (from gfx/font/font_extra.png)
 
-	charmap "<BOLD_A>",  $60 ; unused
+	; charmap "<BOLD_A>",  $60 ; unused
-	charmap "<BOLD_B>",  $61 ; unused
+	; charmap "<BOLD_B>",  $61 ; unused
-	charmap "<BOLD_C>",  $62 ; unused
+	; charmap "<BOLD_C>",  $62 ; unused
-	charmap "<BOLD_D>",  $63 ; unused
+	; charmap "<BOLD_D>",  $63 ; unused
-	charmap "<BOLD_E>",  $64 ; unused
+	; charmap "<BOLD_E>",  $64 ; unused
-	charmap "<BOLD_F>",  $65 ; unused
+	; charmap "<BOLD_F>",  $65 ; unused
-	charmap "<BOLD_G>",  $66 ; unused
+	; charmap "<BOLD_G>",  $66 ; unused
-	charmap "<BOLD_H>",  $67 ; unused
+	; charmap "<BOLD_H>",  $67 ; unused
-	charmap "<BOLD_I>",  $68 ; unused
+	; charmap "<BOLD_I>",  $68 ; unused
-	charmap "<BOLD_V>",  $69
+	; charmap "<BOLD_V>",  $69 ; unused
-	charmap "<BOLD_S>",  $6a
+	; charmap "<BOLD_S>",  $6a ; unused
-	charmap "<BOLD_L>",  $6b ; unused
+	; charmap "<BOLD_L>",  $6b ; unused
-	charmap "<BOLD_M>",  $6c ; unused
+	; charmap "<BOLD_M>",  $6c ; unused
-	charmap "<COLON>",   $6d ; colon with tinier dots than ":"
+	; charmap "<COLON>",   $6d ; unused (colon with tinier dots than ":")
-	charmap "ぃ",         $6e ; hiragana small i, unused
+	; charmap "ぃ",         $6e ; hiragana small i, unused
-	charmap "ぅ",         $6f ; hiragana small u, unused
+	; charmap "ぅ",         $6f ; hiragana small u, unused
-	charmap "<PO>",      $70
+	charmap "<PO>",      $63
-	charmap "<KE>",      $71
+	charmap "<KE>",      $64
-	charmap "“",         $72 ; opening quote
+	charmap "“",         $65 ; opening quote
-	charmap "”",         $73 ; closing quote
+	charmap "”",         $66 ; closing quote
-	charmap "·",         $74 ; middle dot, unused
+	; charmap "·",         $74 ; middle dot, unused
-	charmap "…",         $75 ; ellipsis
+	charmap "…",         $67 ; ellipsis
-	charmap "ぁ",         $76 ; hiragana small a, unused
+	; charmap "ぁ",         $76 ; hiragana small a, unused
-	charmap "ぇ",         $77 ; hiragana small e, unused
+	; charmap "ぇ",         $77 ; hiragana small e, unused
-	charmap "ぉ",         $78 ; hiragana small o, unused
+	; charmap "ぉ",         $78 ; hiragana small o, unused
 
 	charmap "┌",         $79
 	charmap "─",         $7a
@@ -159,12 +158,12 @@
 	charmap "y",         $b8
 	charmap "z",         $b9
 
-	charmap "Ä",         $c0
+	; charmap "Ä",         $c0
-	charmap "Ö",         $c1
+	; charmap "Ö",         $c1
-	charmap "Ü",         $c2
+	; charmap "Ü",         $c2
-	charmap "ä",         $c3
+	; charmap "ä",         $c3
-	charmap "ö",         $c4
+	; charmap "ö",         $c4
-	charmap "ü",         $c5
+	; charmap "ü",         $c5
 
 	charmap "'d",        $d0
 	charmap "'l",        $d1
@@ -193,7 +192,7 @@
 	charmap "♂",         $ef
 	charmap "¥",         $f0
 	charmap "×",         $f1
-	charmap "<DOT>",     $f2 ; decimal point; same as "." in English
+	; charmap "<DOT>",     $f2 ; decimal point; same as "." in English
 	charmap "/",         $f3
 	charmap ",",         $f4
 	charmap "♀",         $f5
@@ -209,215 +208,6 @@
 	charmap "8",         $fe
 	charmap "9",         $ff
 
-; Japanese control characters (see home/text.asm)
-
-	charmap "<JP_18>",   $18 ; "ノ゛" (ungrammatical)
-	charmap "<NI>",      $1d ; "に　"
-	charmap "<TTE>",     $1e ; "って"
-	charmap "<WO>",      $1f ; "を　"
-	charmap "<TA!>",     $22 ; "た！"
-	charmap "<KOUGEKI>", $23 ; "こうげき"
-	charmap "<WA>",      $24 ; "は　"
-	charmap "<NO>",      $25 ; "の　"
-	charmap "<ROUTE>",   $35 ; "ばん　どうろ"
-	charmap "<WATASHI>", $36 ; "わたし"
-	charmap "<KOKO_WA>", $37 ; "ここは"
-	charmap "<GA>",      $4a ; "が　"
-
-; Japanese kana, for those bits of text that were not translated to English
-
-	charmap "ガ", $05
-	charmap "ギ", $06
-	charmap "グ", $07
-	charmap "ゲ", $08
-	charmap "ゴ", $09
-	charmap "ザ", $0a
-	charmap "ジ", $0b
-	charmap "ズ", $0c
-	charmap "ゼ", $0d
-	charmap "ゾ", $0e
-	charmap "ダ", $0f
-	charmap "ヂ", $10
-	charmap "ヅ", $11
-	charmap "デ", $12
-	charmap "ド", $13
-
-	charmap "バ", $19
-	charmap "ビ", $1a
-	charmap "ブ", $1b
-	charmap "ボ", $1c
-
-	charmap "が", $26
-	charmap "ぎ", $27
-	charmap "ぐ", $28
-	charmap "げ", $29
-	charmap "ご", $2a
-	charmap "ざ", $2b
-	charmap "じ", $2c
-	charmap "ず", $2d
-	charmap "ぜ", $2e
-	charmap "ぞ", $2f
-	charmap "だ", $30
-	charmap "ぢ", $31
-	charmap "づ", $32
-	charmap "で", $33
-	charmap "ど", $34
-
-	charmap "ば", $3a
-	charmap "び", $3b
-	charmap "ぶ", $3c
-	charmap "べ", $3d
-	charmap "ぼ", $3e
-
-	charmap "パ", $40
-	charmap "ピ", $41
-	charmap "プ", $42
-	charmap "ポ", $43
-	charmap "ぱ", $44
-	charmap "ぴ", $45
-	charmap "ぷ", $46
-	charmap "ぺ", $47
-	charmap "ぽ", $48
-
-	charmap "「", $70
-	charmap "」", $71
-	charmap "』", $73
-	charmap "・", $74
-	charmap "⋯", $75
-
-	charmap "　", $7f
-
-	charmap "ア", $80
-	charmap "イ", $81
-	charmap "ウ", $82
-	charmap "エ", $83
-	charmap "オ", $84
-	charmap "カ", $85
-	charmap "キ", $86
-	charmap "ク", $87
-	charmap "ケ", $88
-	charmap "コ", $89
-	charmap "サ", $8a
-	charmap "シ", $8b
-	charmap "ス", $8c
-	charmap "セ", $8d
-	charmap "ソ", $8e
-	charmap "タ", $8f
-	charmap "チ", $90
-	charmap "ツ", $91
-	charmap "テ", $92
-	charmap "ト", $93
-	charmap "ナ", $94
-	charmap "ニ", $95
-	charmap "ヌ", $96
-	charmap "ネ", $97
-	charmap "ノ", $98
-	charmap "ハ", $99
-	charmap "ヒ", $9a
-	charmap "フ", $9b
-	charmap "ホ", $9c
-	charmap "マ", $9d
-	charmap "ミ", $9e
-	charmap "ム", $9f
-	charmap "メ", $a0
-	charmap "モ", $a1
-	charmap "ヤ", $a2
-	charmap "ユ", $a3
-	charmap "ヨ", $a4
-	charmap "ラ", $a5
-	charmap "ル", $a6
-	charmap "レ", $a7
-	charmap "ロ", $a8
-	charmap "ワ", $a9
-	charmap "ヲ", $aa
-	charmap "ン", $ab
-	charmap "ッ", $ac
-	charmap "ャ", $ad
-	charmap "ュ", $ae
-	charmap "ョ", $af
-	charmap "ィ", $b0
-
-	charmap "あ", $b1
-	charmap "い", $b2
-	charmap "う", $b3
-	charmap "え", $b4
-	charmap "お", $b5
-	charmap "か", $b6
-	charmap "き", $b7
-	charmap "く", $b8
-	charmap "け", $b9
-	charmap "こ", $ba
-	charmap "さ", $bb
-	charmap "し", $bc
-	charmap "す", $bd
-	charmap "せ", $be
-	charmap "そ", $bf
-	charmap "た", $c0
-	charmap "ち", $c1
-	charmap "つ", $c2
-	charmap "て", $c3
-	charmap "と", $c4
-	charmap "な", $c5
-	charmap "に", $c6
-	charmap "ぬ", $c7
-	charmap "ね", $c8
-	charmap "の", $c9
-	charmap "は", $ca
-	charmap "ひ", $cb
-	charmap "ふ", $cc
-	charmap "へ", $cd
-	charmap "ほ", $ce
-	charmap "ま", $cf
-	charmap "み", $d0
-	charmap "む", $d1
-	charmap "め", $d2
-	charmap "も", $d3
-	charmap "や", $d4
-	charmap "ゆ", $d5
-	charmap "よ", $d6
-	charmap "ら", $d7
-	charmap "り", $d8
-	charmap "る", $d9
-	charmap "れ", $da
-	charmap "ろ", $db
-	charmap "わ", $dc
-	charmap "を", $dd
-	charmap "ん", $de
-	charmap "っ", $df
-	charmap "ゃ", $e0
-	charmap "ゅ", $e1
-	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
-
 ; ASCII charmap, for mobile functions
 pushc
 	newcharmap ascii

constants/item_data_constants.asm

@@ -59,14 +59,6 @@ DEF MAILBOX_CAPACITY      EQU 10
 DEF MAIL_STRUCT_LENGTH    EQU $2f ; mailmsg struct
 DEF MAIL_STRUCT_LENGTH_JP EQU $2a ; mailmsg_jp struct
 
-; mail languages
-	const_def
-	const MAIL_LANG_ENGLISH
-	const MAIL_LANG_FRENCH
-	const MAIL_LANG_GERMAN
-	const MAIL_LANG_ITALIAN
-	const MAIL_LANG_SPANISH
-
 ; held item effects
 	const_def
 	const HELD_NONE

constants/menu_constants.asm

@@ -107,7 +107,7 @@ DEF NUM_PARTYMENUACTIONS EQU const_value
 	const NAME_RIVAL
 	const NAME_MOM
 	const NAME_BOX
-	const NAME_FRIEND
+	const NAME_5 ; duplicate of NAME_MON
 	const NAME_6 ; duplicate of NAME_MON
 	const NAME_7 ; duplicate of NAME_MON
 DEF NUM_NAME_TYPES EQU const_value

constants/text_constants.asm

@@ -45,8 +45,7 @@ DEF PRINTNUM_LEFTALIGN    EQU 1 << PRINTNUM_LEFTALIGN_F
 DEF PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F
 
 ; character sets (see charmap.asm)
-DEF FIRST_REGULAR_TEXT_CHAR     EQU $60
+DEF FIRST_REGULAR_TEXT_CHAR     EQU $7f
-DEF FIRST_HIRAGANA_DAKUTEN_CHAR EQU $20
 
 ; gfx/font/unown_font.png
 DEF FIRST_UNOWN_CHAR EQU $40

data/text/unused_dakutens.asm

@@ -1,15 +0,0 @@
-Dakutens: ; unreferenced
-	db "かが", "きぎ", "くぐ", "けげ", "こご"
-	db "さざ", "しじ", "すず", "せぜ", "そぞ"
-	db "ただ", "ちぢ", "つづ", "てで", "とど"
-	db "はば", "ひび", "ふぶ", "へべ", "ほぼ"
-	db "カガ", "キギ", "クグ", "ケゲ", "コゴ"
-	db "サザ", "シジ", "スズ", "セゼ", "ソゾ"
-	db "タダ", "チヂ", "ツヅ", "テデ", "トド"
-	db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
-	db -1 ; end
-
-Handakutens: ; unreferenced
-	db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
-	db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
-	db -1 ; end

data/text/unused_gen1_trainer_names.asm

@@ -1,71 +0,0 @@
-Gen1TrainerClassNames:
-; Untranslated trainer class names from Red.
-	dw .Youngster
-	dw .BugCatcher
-	dw .Lass
-	dw wOTClassName ; sailor
-	dw .JrTrainerM
-	dw .JrTrainerF
-	dw .Pokemaniac
-	dw .SuperNerd
-	dw wOTClassName ; hiker
-	dw wOTClassName ; biker
-	dw .Burglar
-	dw .Engineer
-	dw .Jack
-	dw wOTClassName ; fisher
-	dw .Swimmer
-	dw wOTClassName ; cue ball
-	dw wOTClassName ; gambler
-	dw .Beauty
-	dw wOTClassName ; psychic
-	dw .Rocker
-	dw .Juggler
-	dw wOTClassName ; tamer
-	dw wOTClassName ; bird keeper
-	dw .Blackbelt
-	dw wOTClassName ; rival1
-	dw .ProfOak
-	dw .Chief
-	dw .Scientist
-	dw wOTClassName ; giovanni
-	dw .Rocket
-	dw .CooltrainerM
-	dw .CooltrainerF
-	dw wOTClassName ; bruno
-	dw wOTClassName ; brock
-	dw wOTClassName ; misty
-	dw wOTClassName ; lt.surge
-	dw wOTClassName ; erika
-	dw wOTClassName ; koga
-	dw wOTClassName ; blaine
-	dw wOTClassName ; sabrina
-	dw wOTClassName ; gentleman
-	dw wOTClassName ; rival2
-	dw wOTClassName ; rival3
-	dw wOTClassName ; lorelei
-	dw wOTClassName ; channeler
-	dw wOTClassName ; agatha
-	dw wOTClassName ; lance
-
-.Youngster:    db "たんパン@"
-.BugCatcher:   db "むしとり@"
-.Lass:         db "ミニスカ@"
-.JrTrainerM:   db "ボーイ@"
-.JrTrainerF:   db "ガール@"
-.Pokemaniac:   db "マニア@"
-.SuperNerd:    db "りかけい@"
-.Burglar:      db "どろぼう@"
-.Engineer:     db "オヤジ@"
-.Jack:         db "ジャック@"
-.Swimmer:      db "かいパン@"
-.Beauty:       db "おねえさん@"
-.Rocker:       db "グループ@"
-.Juggler:      db "ジャグラー@"
-.Blackbelt:    db "からて@"
-.ProfOak:      db "オーキド@"
-.Chief:        db "チーフ@"
-.Scientist:    db "けんきゅういん@"
-.Rocket:       db "だんいん@"
-.CooltrainerM: db "エりート♂@"
-.CooltrainerF: db "エりート♀@"

engine/battle/getgen1trainerclassname.asm

@@ -1,21 +0,0 @@
-GetGen1TrainerClassName: ; unreferenced
-	ld hl, Gen1TrainerClassNames
-	ld a, [wTrainerClass]
-	dec a
-	ld c, a
-	ld b, 0
-	add hl, bc
-	add hl, bc
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	ld de, wStringBuffer1
-.copy
-	ld a, [hli]
-	ld [de], a
-	inc de
-	cp "@"
-	jr nz, .copy
-	ret
-
-INCLUDE "data/text/unused_gen1_trainer_names.asm"

engine/battle/menu.asm

@@ -61,10 +61,10 @@ SafariBattleMenuHeader:
 	dba .PrintSafariBallsRemaining
 
 .Text:
-	db "サファりボール×　　@" ; "SAFARI BALL×  @"
+	db "SAFARI BALL×  @"
-	db "エサをなげる@" ; "THROW BAIT"
+	db "THROW BAIT@"
-	db "いしをなげる@" ; "THROW ROCK"
+	db "THROW ROCK@"
-	db "にげる@" ; "RUN"
+	db "RUN@"
 
 .PrintSafariBallsRemaining:
 	hlcoord 17, 13

engine/battle/trainer_huds.asm

@@ -246,9 +246,9 @@ _ShowLinkBattleParticipants:
 	ld de, wOTPlayerName
 	call PlaceString
 	hlcoord 9, 8
-	ld a, "<BOLD_V>"
+	ld a, "V"
 	ld [hli], a
-	ld [hl], "<BOLD_S>"
+	ld [hl], "S"
 	farcall LinkBattle_TrainerHuds ; no need to farcall
 	ld b, CGB_DIPLOMA
 	call GetCGBLayout

engine/debug/color_picker.asm

@@ -373,13 +373,13 @@ DebugColor_InitScreen:
 	ret
 
 .ShinyText:
-	db "レア", DEBUGTEST_BLACK, DEBUGTEST_BLACK, "@" ; Rare (shiny)
+	db "Shny", "@"
 
 .NormalText:
-	db "ノーマル@" ; Normal
+	db "Nrml@"
 
 .SwitchText:
-	db DEBUGTEST_A, "きりかえ▶@" ; (A) Switches
+	db DEBUGTEST_A, "Chng▶@"
 
 DebugColor_LoadRGBMeter:
 	decoord 0, 11, wAttrmap
@@ -736,10 +736,10 @@ DebugColor_PrintTMHMMove:
 	ret
 
 .AbleText:
-	db "おぼえられる@" ; Learnable
+	db "Able@"
 
 .NotAbleText:
-	db "おぼえられない@" ; Not learnable
+	db "Unable@"
 
 .GetNumberedTMHM:
 	cp NUM_TMS
@@ -1000,9 +1000,9 @@ DebugColor_PlaceCursor:
 	ret
 
 DebugColor_AreYouFinishedString:
-	db   "おわりますか？"                        ; Are you finished?
+	db   "Finish?"
-	next "はい<DOT><DOT><DOT>", DEBUGTEST_A ; YES...(A)
+	next "YES", DEBUGTEST_BLACK, DEBUGTEST_BLACK, DEBUGTEST_A
-	next "いいえ<DOT><DOT>", DEBUGTEST_B     ; NO..(B)
+	next "NO", DEBUGTEST_BLACK, DEBUGTEST_BLACK, DEBUGTEST_B
 	db   "@"
 
 DebugColor_UpArrowGFX:
@@ -1378,9 +1378,3 @@ DebugTileset_CalculatePalette:
 	ld [hli], a
 	ld [hl], d
 	ret
-
-.dummy1: ; unreferenced
-	ret
-
-.dummy2: ; unreferenced
-	ret

engine/events/halloffame.asm

@@ -476,7 +476,7 @@ DisplayHOFMon:
 	hlcoord 1, 13
 	ld a, "№"
 	ld [hli], a
-	ld [hl], "<DOT>"
+	ld [hl], "."
 	hlcoord 3, 13
 	ld de, wTextDecimalByte
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 3
@@ -519,10 +519,6 @@ DisplayHOFMon:
 
 HOF_AnimatePlayerPic:
 	call ClearBGPalettes
-	ld hl, vTiles2 tile HALLOFFAME_COLON
-	ld de, FontExtra + 13 tiles ; "<COLON>"
-	lb bc, BANK(FontExtra), 1
-	call Request2bpp
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
@@ -592,7 +588,7 @@ HOF_AnimatePlayerPic:
 	ld de, wGameTimeHours
 	lb bc, 2, 3
 	call PrintNum
-	ld [hl], HALLOFFAME_COLON
+	ld [hl], ":"
 	inc hl
 	ld de, wGameTimeMinutes
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2

engine/games/memory_game.asm

@@ -463,9 +463,9 @@ MemoryGame_InitStrings:
 .dummy_text
 	db "@"
 .japstr1
-	db "とったもの@"
+	db "?????@"
 .japstr2
-	db "あと　かい@"
+	db "?? ??@"
 
 MemoryGame_Card2Coord:
 	ld d, 0

engine/gfx/load_font.asm

@@ -50,9 +50,9 @@ _LoadFontsExtra1::
 	ld hl, vTiles2 tile "☎" ; $62
 	lb bc, BANK(PokegearPhoneIconGFX), 1
 	call Get2bppViaHDMA
-	ld de, FontExtra + 3 tiles ; "<BOLD_D>"
+	ld de, FontExtra ; "<PO>"
-	ld hl, vTiles2 tile "<BOLD_D>"
+	ld hl, vTiles2 tile "<PO>" ; $63
-	lb bc, BANK(FontExtra), 22 ; "<BOLD_D>" to "ぉ"
+	lb bc, BANK(FontExtra), 5 ; "<PO>" to "…"
 	call Get2bppViaHDMA
 	jr LoadFrame
 

engine/items/mart.asm

@@ -805,9 +805,6 @@ MartSellPriceText:
 	text_far _MartSellPriceText
 	text_end
 
-UnusedDummyString: ; unreferenced
-	db "！ダミー！@" ; "!Dummy!"
-
 MartWelcomeText:
 	text_far _MartWelcomeText
 	text_end

engine/link/link.asm

@@ -406,34 +406,7 @@ endc
 	pop bc
 	dec b
 	jr nz, .copy_author_loop
-	ld b, PARTY_LENGTH
-	ld de, wLinkReceivedMail
-.fix_mail_loop
-	push bc
-	push de
-	farcall ParseMailLanguage
-	ld a, c
-	or a
-	jr z, .next
-	sub $3
-	jr nc, .skip
-	farcall ConvertEnglishMailToFrenchGerman
-	jr .next
 
-.skip
-	cp $2
-	jr nc, .next
-	farcall ConvertEnglishMailToSpanishItalian
-
-.next
-	pop de
-	ld hl, MAIL_STRUCT_LENGTH
-	add hl, de
-	ld d, h
-	ld e, l
-	pop bc
-	dec b
-	jr nz, .fix_mail_loop
 	ld de, wLinkReceivedMailEnd
 	xor a
 	ld [de], a
@@ -937,40 +910,6 @@ Link_PrepPartyData_Gen2:
 	dec b
 	jr nz, .metadata_loop
 
-; Translate the messages if necessary
-	ld b, PARTY_LENGTH
-	ld de, sPartyMail
-	ld hl, wLinkPlayerMailMessages
-.translate_loop
-	push bc
-	push hl
-	push de
-	push hl
-	farcall ParseMailLanguage
-	pop de
-	ld a, c
-	or a ; MAIL_LANG_ENGLISH
-	jr z, .translate_next
-	sub MAIL_LANG_ITALIAN
-	jr nc, .italian_spanish
-	farcall ConvertFrenchGermanMailToEnglish
-	jr .translate_next
-.italian_spanish
-	cp (MAIL_LANG_SPANISH + 1) - MAIL_LANG_ITALIAN
-	jr nc, .translate_next
-	farcall ConvertSpanishItalianMailToEnglish
-.translate_next
-	pop de
-	ld hl, MAIL_STRUCT_LENGTH
-	add hl, de
-	ld d, h
-	ld e, l
-	pop hl
-	ld bc, MAIL_MSG_LENGTH + 1
-	add hl, bc
-	pop bc
-	dec b
-	jr nz, .translate_loop
 	call CloseSRAM
 
 ; The SERIAL_NO_DATA_BYTE value isn't allowed anywhere in message text

engine/math/print_num.asm

@@ -166,7 +166,7 @@ _PrintNum::
 	dec e
 	jr nz, .money_leading_zero
 	inc hl
-	ld [hl], "<DOT>"
+	ld [hl], "."
 
 .money_leading_zero
 	call .AdvancePointer
@@ -276,7 +276,7 @@ _PrintNum::
 	dec e
 	ret nz
 	inc hl
-	ld [hl], "<DOT>"
+	ld [hl], "."
 	ret
 
 .PrintLeadingZero:

engine/menus/intro_menu.asm

@@ -509,7 +509,7 @@ Continue_DisplayGameTime:
 	ld de, wGameTimeHours
 	lb bc, 2, 3
 	call PrintNum
-	ld [hl], "<COLON>"
+	ld [hl], ":"
 	inc hl
 	ld de, wGameTimeMinutes
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2

engine/menus/menu_2.asm

@@ -127,9 +127,9 @@ StartMenu_PrintSafariGameStatus: ; unreferenced
 	ld de, .slash_500
 	call PlaceString
 	hlcoord 1, 3
-	ld de, .booru_ko
+	ld de, .ball
 	call PlaceString
-	hlcoord 5, 3
+	hlcoord 6, 3
 	ld de, wSafariBallsRemaining
 	lb bc, 1, 2
 	call PrintNum
@@ -138,9 +138,9 @@ StartMenu_PrintSafariGameStatus: ; unreferenced
 	ret
 
 .slash_500
-	db "／５００@"
+	db "/500@"
-.booru_ko
+.ball
-	db "ボール　　　こ@"
+	db "BALL@"
 
 StartMenu_DrawBugContestStatusBox:
 	hlcoord 0, 0
@@ -193,8 +193,6 @@ StartMenu_PrintBugContestStatus:
 	ld [wOptions], a
 	ret
 
-.BallsJPString: ; unreferenced
-	db "ボール　　　こ@"
 .CaughtString:
 	db "CAUGHT@"
 .BallsString:

engine/menus/naming_screen.asm

@@ -2,7 +2,7 @@ DEF NAMINGSCREEN_CURSOR     EQU $7e
 
 DEF NAMINGSCREEN_BORDER     EQU "■" ; $60
 DEF NAMINGSCREEN_MIDDLELINE EQU "→" ; $eb
-DEF NAMINGSCREEN_UNDERLINE  EQU "<DOT>" ; $f2
+DEF NAMINGSCREEN_UNDERLINE  EQU "." ; $e8
 
 _NamingScreen:
 	call DisableSpriteUpdates
@@ -79,7 +79,7 @@ NamingScreen:
 	dw .Rival
 	dw .Mom
 	dw .Box
-	dw .Tomodachi
+	dw .Pokemon
 	dw .Pokemon
 	dw .Pokemon
 
@@ -180,16 +180,6 @@ NamingScreen:
 .BoxNameString:
 	db "BOX NAME?@"
 
-.Tomodachi:
-	hlcoord 3, 2
-	ld de, .oTomodachi_no_namae_sutoringu
-	call PlaceString
-	call .StoreSpriteIconParams
-	ret
-
-.oTomodachi_no_namae_sutoringu
-	db "おともだち　の　なまえは？@"
-
 .LoadSprite:
 	push de
 	ld hl, vTiles0 tile $00
@@ -715,8 +705,6 @@ AddDakutenToCharacter: ; unreferenced
 	ld a, [hl]
 	jr NamingScreen_LoadNextCharacter
 
-INCLUDE "data/text/unused_dakutens.asm"
-
 NamingScreen_DeleteCharacter:
 	ld hl, wNamingScreenCurNameLength
 	ld a, [hl]
@@ -881,9 +869,6 @@ INCBIN "gfx/naming_screen/cursor.2bpp"
 
 INCLUDE "data/text/name_input_chars.asm"
 
-NamingScreenGFX_End: ; unreferenced
-INCBIN "gfx/naming_screen/end.1bpp"
-
 NamingScreenGFX_MiddleLine:
 INCBIN "gfx/naming_screen/middle_line.1bpp"
 
@@ -968,9 +953,6 @@ INCBIN "gfx/naming_screen/mail.2bpp"
 	ld [wNamingScreenMaxNameLength], a
 	ret
 
-.PleaseWriteAMailString: ; unreferenced
-	db "メールを　かいてね@"
-
 .InitCharset:
 	call WaitTop
 	hlcoord 0, 0

engine/movie/trade_animation.asm

@@ -1390,45 +1390,6 @@ TradeAnim_WaitAnim2:
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-DebugTrade: ; unreferenced
-; This function was meant for use in Japanese versions, so the
-; constant used for copy length was changed by accident.
-
-	ld hl, .DebugTradeData
-
-	ld a, [hli]
-	ld [wPlayerTrademonSpecies], a
-	ld de, wPlayerTrademonSenderName
-	ld c, NAME_LENGTH + 2 ; JP: NAME_LENGTH_JAPANESE + 2
-.loop1
-	ld a, [hli]
-	ld [de], a
-	inc de
-	dec c
-	jr nz, .loop1
-
-	ld a, [hli]
-	ld [wOTTrademonSpecies], a
-	ld de, wOTTrademonSenderName
-	ld c, NAME_LENGTH + 2 ; JP: NAME_LENGTH_JAPANESE + 2
-.loop2
-	ld a, [hli]
-	ld [de], a
-	inc de
-	dec c
-	jr nz, .loop2
-	ret
-
-MACRO debugtrade
-; species, ot name, ot id
-	db \1, \2
-	dw \3
-ENDM
-
-.DebugTradeData:
-	debugtrade VENUSAUR,  "ゲーフり@@", $0123 ; GAME FREAK
-	debugtrade CHARIZARD, "クりーチャ@", $0456 ; Creatures Inc.
-
 TradeGameBoyTilemap:  INCBIN "gfx/trade/game_boy.tilemap" ; 6x8
 TradeLinkTubeTilemap: INCBIN "gfx/trade/link_cable.tilemap" ; 12x3
 

engine/pokemon/bills_pc.asm

@@ -782,9 +782,6 @@ BillsPC_InitRAM:
 	call ByteFill
 	xor a
 	ld [wJumptableIndex], a
-	ld [wUnusedBillsPCData], a
-	ld [wUnusedBillsPCData+1], a
-	ld [wUnusedBillsPCData+2], a
 	ld [wBillsPC_CursorPosition], a
 	ld [wBillsPC_ScrollPosition], a
 	ret

engine/pokemon/correct_nick_errors.asm

@@ -64,11 +64,5 @@ CorrectNickErrors::
 ; table defining which characters are actually text commands
 ; format:
 	;      ≥           <
-	db "<NULL>",   "ガ"
+	db "<NULL>", FIRST_REGULAR_TEXT_CHAR
-	db "<PLAY_G>", "<JP_18>" + 1
-	db "<NI>",     "<NO>"    + 1
-	db "<ROUTE>",  "<GREEN>" + 1
-	db "<ENEMY>",  "<ENEMY>" + 1
-	db "<MOM>",    "<TM>"    + 1
-	db "<ROCKET>", "┘"       + 1
 	db -1 ; end

engine/pokemon/european_mail.asm

@@ -1,118 +0,0 @@
-ParseMailLanguage:
-	ld c, MAIL_LANG_ENGLISH
-	ld hl, sPartyMon1MailNationality - sPartyMon1Mail
-	add hl, de
-	ld a, [hli]
-	cp "E"
-	ret nz
-	ld a, [hli]
-	inc c ; MAIL_LANG_FRENCH
-	cp "F"
-	ret z
-	inc c ; MAIL_LANG_GERMAN
-	cp "G"
-	ret z
-	inc c ; MAIL_LANG_ITALIAN
-	cp "I"
-	ret z
-	inc c ; MAIL_LANG_SPANISH
-	cp "S"
-	ret z
-	ld c, MAIL_LANG_ENGLISH
-	ret
-
-; The regular font.
-StandardEnglishFont:
-INCBIN "gfx/font/english.1bpp"
-
-; An extended font.
-FrenchGermanFont:
-INCBIN "gfx/font/french_german.1bpp"
-
-; An even more extended font.
-SpanishItalianFont:
-INCBIN "gfx/font/spanish_italian.1bpp"
-
-ConvertFrenchGermanMailToEnglish:
-; Called if mail is French or German
-; Converts 's 't 'v from French/German character set to English
-	ld b, sPartyMon1MailAuthor - sPartyMon1Mail
-	ld h, d
-	ld l, e
-.loop
-	ld a, [hl]
-	cp $dc ; 's in French/German font
-	jr nz, .check_intermediate_chars
-	ld a, "'s"
-	jr .replace
-
-.check_intermediate_chars
-	sub "'s"
-	jr c, .dont_replace
-	cp "'v" - "'s" + 1
-	jr nc, .dont_replace
-	add $cd
-
-.replace
-	ld [hl], a
-
-.dont_replace
-	inc hl
-	dec b
-	jr nz, .loop
-	ret
-
-ConvertEnglishMailToFrenchGerman:
-; Called if mail is English and game is French or German
-; Converts 's 't 'v from English character set to French/German
-	ld b, sPartyMon1MailAuthor - sPartyMon1Mail
-	ld h, d
-	ld l, e
-.loop
-	ld a, [hl]
-	cp "'s"
-	jr nz, .check_intermediate_chars
-	ld a, $dc ; 's in French/German font
-	jr .replace
-
-.check_intermediate_chars
-	sub $cd
-	jr c, .dont_replace
-	cp "'v" - "'s" + 1
-	jr nc, .dont_replace
-	add "'s"
-
-.replace
-	ld [hl], a
-
-.dont_replace
-	inc hl
-	dec b
-	jr nz, .loop
-	ret
-
-ConvertSpanishItalianMailToEnglish:
-; Called if mail is Spanish or Italian
-; Converts 'd 'l 'm 'r 's 't 'v from Spanish/Italian character set to English
-ConvertEnglishMailToSpanishItalian:
-; Called if mail is English and game is Spanish or Italian
-; Converts 'd 'l 'm 'r 's 't 'v from English character set to Spanish/Italian
-	ld b, sPartyMon1MailAuthor - sPartyMon1Mail
-	ld h, d
-	ld l, e
-.loop
-	ld a, [hl]
-	and $f0
-	cp $d0
-	jr nz, .dont_replace
-	ld a, [hl]
-	add $8
-	and $f
-	or $d0
-	ld [hl], a
-
-.dont_replace
-	inc hl
-	dec b
-	jr nz, .loop
-	ret

engine/pokemon/mail_2.asm

@@ -29,22 +29,9 @@ ReadAnyMail:
 	call LoadFontsExtra
 	pop de
 	push de
-	ld a, BANK(sPartyMail)
-	call OpenSRAM
-	farcall ParseMailLanguage
-	call CloseSRAM
-	ld a, c
-	ld de, StandardEnglishFont
-	or a ; MAIL_LANG_ENGLISH
-	jr z, .got_font
-	ld de, FrenchGermanFont
-	sub MAIL_LANG_ITALIAN
-	jr c, .got_font
-	ld de, SpanishItalianFont
-
-.got_font
 	ld hl, vTiles1
-	lb bc, BANK(StandardEnglishFont), $80
+	ld de, Font
+	lb bc, BANK(Font), $80
 	call Get1bpp
 	pop de
 	call .LoadGFX

home/text.asm

@@ -208,9 +208,6 @@ ENDM
 	dict "<MOM>",     PrintMomsName
 	dict "<PLAYER>",  PrintPlayerName
 	dict "<RIVAL>",   PrintRivalName
-	dict "<ROUTE>",   PlaceJPRoute
-	dict "<WATASHI>", PlaceWatashi
-	dict "<KOKO_WA>", PlaceKokoWa
 	dict "<RED>",     PrintRedsName
 	dict "<GREEN>",   PrintGreensName
 	dict "#",         PlacePOKe
@@ -218,7 +215,6 @@ ENDM
 	dict "<ROCKET>",  RocketChar
 	dict "<TM>",      TMChar
 	dict "<TRAINER>", TrainerChar
-	dict "<KOUGEKI>", PlaceKougeki
 	dict "<LF>",      LineFeedChar
 	dict "<CONT>",    ContText
 	dict "<……>",      SixDotsChar
@@ -232,50 +228,7 @@ ENDM
 	dict "<TARGET>",  PlaceMoveTargetsName
 	dict "<USER>",    PlaceMoveUsersName
 	dict "<ENEMY>",   PlaceEnemysName
-	dict "<PLAY_G>",  PlaceGenderedPlayerName
-	dict "ﾟ",         .diacritic
-	dict "ﾞ",         .diacritic
-	jr .not_diacritic
 
-.diacritic
-	ld b, a
-	call Diacritic
-	jp NextChar
-
-.not_diacritic
-	cp FIRST_REGULAR_TEXT_CHAR
-	jr nc, .place
-; dakuten or handakuten
-	cp "パ"
-	jr nc, .handakuten
-; dakuten
-	cp FIRST_HIRAGANA_DAKUTEN_CHAR
-	jr nc, .hiragana_dakuten
-; katakana dakuten
-	add "カ" - "ガ"
-	jr .place_dakuten
-
-.hiragana_dakuten
-	add "か" - "が"
-.place_dakuten
-	ld b, "ﾞ" ; dakuten
-	call Diacritic
-	jr .place
-
-.handakuten
-	cp "ぱ"
-	jr nc, .hiragana_handakuten
-; katakana handakuten
-	add "ハ" - "パ"
-	jr .place_handakuten
-
-.hiragana_handakuten
-	add "は" - "ぱ"
-.place_handakuten
-	ld b, "ﾟ" ; handakuten
-	call Diacritic
-
-.place
 	ld [hli], a
 	call PrintLetterDelay
 	jp NextChar
@@ -297,13 +250,9 @@ TMChar:       print_name TMCharText
 PCChar:       print_name PCCharText
 RocketChar:   print_name RocketCharText
 PlacePOKe:    print_name PlacePOKeText
-PlaceKougeki: print_name KougekiText
 SixDotsChar:  print_name SixDotsCharText
 PlacePKMN:    print_name PlacePKMNText
 PlacePOKE:    print_name PlacePOKEText
-PlaceJPRoute: print_name PlaceJPRouteText
-PlaceWatashi: print_name PlaceWatashiText
-PlaceKokoWa:  print_name PlaceKokoWaText
 
 PlaceMoveTargetsName::
 	ldh a, [hBattleTurn]
@@ -363,19 +312,6 @@ PlaceEnemysName::
 	ld de, wOTClassName
 	jr PlaceCommandCharacter
 
-PlaceGenderedPlayerName::
-	push de
-	ld de, wPlayerName
-	call PlaceString
-	ld h, b
-	ld l, c
-	ld a, [wPlayerGender]
-	bit PLAYERGENDER_FEMALE_F, a
-	ld de, KunSuffixText
-	jr z, PlaceCommandCharacter
-	ld de, ChanSuffixText
-	jr PlaceCommandCharacter
-
 PlaceCommandCharacter::
 	call PlaceString
 	ld h, b
@@ -388,16 +324,12 @@ TrainerCharText:: db "TRAINER@"
 PCCharText::      db "PC@"
 RocketCharText::  db "ROCKET@"
 PlacePOKeText::   db "POKé@"
-KougekiText::     db "こうげき@"
 SixDotsCharText:: db "……@"
 EnemyText::       db "Enemy @"
 PlacePKMNText::   db "<PK><MN>@"
 PlacePOKEText::   db "<PO><KE>@"
 String_Space::    db " @"
-; These strings have been dummied out.
+
-PlaceJPRouteText::
-PlaceWatashiText::
-PlaceKokoWaText:: db "@"
 KunSuffixText::   db "@"
 ChanSuffixText::  db "@"
 

layout.link

@@ -229,7 +229,6 @@ ROMX $77
 	"Tileset Data 7"
 	"bank77"
 	"Pokégear GFX"
-	"European Mail"
 ROMX $78
 	"Debug Room"
 	"Tileset Data 8"

main.asm

@@ -222,7 +222,6 @@ INCLUDE "engine/events/sweet_scent.asm"
 INCLUDE "engine/events/sacred_ash.asm"
 INCLUDE "engine/pokemon/tempmon.asm"
 INCLUDE "engine/pokemon/types.asm"
-INCLUDE "engine/battle/getgen1trainerclassname.asm"
 INCLUDE "engine/pokemon/mon_stats.asm"
 INCLUDE "engine/link/init_list.asm"
 INCLUDE "engine/pokemon/experience.asm"
@@ -240,7 +239,9 @@ INCLUDE "engine/overworld/player_movement.asm"
 INCLUDE "engine/events/engine_flags.asm"
 INCLUDE "engine/overworld/variables.asm"
 INCLUDE "data/text/battle.asm"
+if DEF(_DEBUG)
 INCLUDE "engine/debug/color_picker.asm"
+endc
 
 
 SECTION "bank21", ROMX
@@ -433,11 +434,6 @@ INCLUDE "engine/events/catch_tutorial_input.asm"
 INCLUDE "engine/pokegear/townmap_convertlinebreakcharacters.asm"
 
 
-SECTION "European Mail", ROMX
-
-INCLUDE "engine/pokemon/european_mail.asm"
-
-
 SECTION "Debug Room", ROMX
 
 if DEF(_DEBUG)

ram/wram.asm

@@ -1070,10 +1070,7 @@ wBattleTransitionCounter:: db
 wBattleTransitionSineWaveOffset::
 wBattleTransitionSpinQuadrant:: db
 
-NEXTU
+if DEF(_DEBUG)
-; bill's pc
-wUnusedBillsPCData:: ds 3
-
 NEXTU
 ; debug mon color picker
 wDebugColorRGBJumptableIndex:: db
@@ -1086,6 +1083,8 @@ wDebugTilesetCurPalette:: db
 wDebugTilesetRGBJumptableIndex:: db
 wDebugTilesetCurColor:: db
 
+endc
+
 NEXTU
 ; stats screen
 wStatsScreenFlags:: db