pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #645: Use English labels for European mail handling functions

Browse Source
This commit is contained in:
Rangi 2019-11-03 20:34:02 -05:00
parent 4d32035d4f
commit 51720e1e3c
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/link/link.asm
View File

@ -371,13 +371,13 @@ Gen2ToGen2LinkComms:
jr z, .next jr z, .next
sub $3 sub $3
jr nc, .skip jr nc, .skip
farcall DeutenEnglischenPost farcall ConvertEnglishMailToFrenchGerman
jr .next jr .next
.skip .skip
cp $2 cp $2
jr nc, .next jr nc, .next
farcall HandleSpanishItalianMail farcall ConvertEnglishMailToSpanishItalian
.next .next
pop de pop de
@ -875,13 +875,13 @@ Link_PrepPartyData_Gen2:
jr z, .next jr z, .next
sub $3 sub $3
jr nc, .italian_spanish jr nc, .italian_spanish
farcall HandleFrenchGermanMail farcall ConvertFrenchGermanMailToEnglish
jr .next jr .next
.italian_spanish .italian_spanish
cp $2 cp $2
jr nc, .next jr nc, .next
farcall HandleSpanishItalianMail farcall ConvertSpanishItalianMailToEnglish
.next .next
pop de pop de

34
engine/pokemon/european_mail.asm
View File

@ -38,15 +38,15 @@ INCBIN "gfx/font/french_german.1bpp"
SpanishItalianFont: SpanishItalianFont:
INCBIN "gfx/font/spanish_italian.1bpp" INCBIN "gfx/font/spanish_italian.1bpp"
HandleFrenchGermanMail: ConvertFrenchGermanMailToEnglish:
; called if mail is french or german ; Called if mail is French or German
; fix 's 't 'v ; Converts 's 't 'v from French/German character set to English
ld b, sPartyMon1MailAuthor - sPartyMon1Mail ld b, sPartyMon1MailAuthor - sPartyMon1Mail
ld h, d ld h, d
ld l, e ld l, e
.loop .loop
ld a, [hl] ld a, [hl]
cp $dc ; 's in french/german font cp $dc ; 's in French/German font
jr nz, .check_intermediate_chars jr nz, .check_intermediate_chars
ld a, "'s" ld a, "'s"
jr .replace jr .replace
@ -67,12 +67,9 @@ HandleFrenchGermanMail:
jr nz, .loop jr nz, .loop
ret ret
LireLeCourrierAnglais: ConvertEnglishMailToFrenchGerman:
DeutenEnglischenPost: ; Called if mail is English and game is French or German
; Cette fonction convertit certains des caractères anglais pour ; Converts 's 't 'v from English character set to French/German
; leur équivalent dans le jeu de caractères français.
; Diese Funktion wandelt bestimmte englische Zeichen, um ihre
; Entsprechung in der Deutschen-Zeichensatz.
ld b, sPartyMon1MailAuthor - sPartyMon1Mail ld b, sPartyMon1MailAuthor - sPartyMon1Mail
ld h, d ld h, d
ld l, e ld l, e
@ -80,7 +77,7 @@ DeutenEnglischenPost:
ld a, [hl] ld a, [hl]
cp "'s" cp "'s"
jr nz, .check_intermediate_chars jr nz, .check_intermediate_chars
ld a, $dc ld a, $dc ; 's in French/German font
jr .replace jr .replace
.check_intermediate_chars .check_intermediate_chars
@ -99,15 +96,12 @@ DeutenEnglischenPost:
jr nz, .loop jr nz, .loop
ret ret
HandleSpanishItalianMail: ConvertSpanishItalianMailToEnglish:
LeerCorreosIngleses: ; Called if mail is Spanish or Italian
LeggiPostaInglese: ; Converts 'd 'l 'm 'r 's 't 'v from Spanish/Italian character set to English
; This function converts certain characters between ConvertEnglishMailToSpanishItalian:
; the English and Spanish/Italian character sets. ; Called if mail is English and game is Spanish or Italian
; Esta función convierte ciertos caracteres entre ; Converts 'd 'l 'm 'r 's 't 'v from English character set to Spanish/Italian
; el juego de caracteres Inglés y Español.
; Questa funzione converte alcuni caratteri tra
; l'inglese e il set di caratteri italiani.
ld b, sPartyMon1MailAuthor - sPartyMon1Mail ld b, sPartyMon1MailAuthor - sPartyMon1Mail
ld h, d ld h, d
ld l, e ld l, e