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

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 "エサをなげる@" ; "THROW BAIT"
-	db "いしをなげる@" ; "THROW ROCK"
-	db "にげる@" ; "RUN"
+	db "SAFARI BALL×  @"
+	db "THROW BAIT@"
+	db "THROW ROCK@"
+	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?
-	next "はい<DOT><DOT><DOT>", DEBUGTEST_A ; YES...(A)
-	next "いいえ<DOT><DOT>", DEBUGTEST_B     ; NO..(B)
+	db   "Finish?"
+	next "YES", DEBUGTEST_BLACK, DEBUGTEST_BLACK, DEBUGTEST_A
+	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 hl, vTiles2 tile "<BOLD_D>"
-	lb bc, BANK(FontExtra), 22 ; "<BOLD_D>" to "ぉ"
+	ld de, FontExtra ; "<PO>"
+	ld hl, vTiles2 tile "<PO>" ; $63
+	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 "／５００@"
-.booru_ko
-	db "ボール　　　こ@"
+	db "/500@"
+.ball
+	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 "<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 "<NULL>", FIRST_REGULAR_TEXT_CHAR
 	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