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

This commit is contained in:
xCrystal
2023-08-02 18:21:34 +02:00
parent dd04feb32a
commit a1e095074c
34 changed files with 74 additions and 747 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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