diff options
| -rw-r--r-- | engine/link/link.asm | 8 | ||||
| -rw-r--r-- | engine/pokemon/european_mail.asm | 34 |
2 files changed, 18 insertions, 24 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm index d12f6bdd8..0ddff205f 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -371,13 +371,13 @@ Gen2ToGen2LinkComms: jr z, .next sub $3 jr nc, .skip - farcall DeutenEnglischenPost + farcall ConvertEnglishMailToFrenchGerman jr .next .skip cp $2 jr nc, .next - farcall HandleSpanishItalianMail + farcall ConvertEnglishMailToSpanishItalian .next pop de @@ -875,13 +875,13 @@ Link_PrepPartyData_Gen2: jr z, .next sub $3 jr nc, .italian_spanish - farcall HandleFrenchGermanMail + farcall ConvertFrenchGermanMailToEnglish jr .next .italian_spanish cp $2 jr nc, .next - farcall HandleSpanishItalianMail + farcall ConvertSpanishItalianMailToEnglish .next pop de diff --git a/engine/pokemon/european_mail.asm b/engine/pokemon/european_mail.asm index 38c542d35..eb9b7d5d9 100644 --- a/engine/pokemon/european_mail.asm +++ b/engine/pokemon/european_mail.asm @@ -38,15 +38,15 @@ INCBIN "gfx/font/french_german.1bpp" SpanishItalianFont: INCBIN "gfx/font/spanish_italian.1bpp" -HandleFrenchGermanMail: -; called if mail is french or german -; fix 's 't 'v +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 + cp $dc ; 's in French/German font jr nz, .check_intermediate_chars ld a, "'s" jr .replace @@ -67,12 +67,9 @@ HandleFrenchGermanMail: jr nz, .loop ret -LireLeCourrierAnglais: -DeutenEnglischenPost: -; Cette fonction convertit certains des caractères anglais pour -; leur équivalent dans le jeu de caractères français. -; Diese Funktion wandelt bestimmte englische Zeichen, um ihre -; Entsprechung in der Deutschen-Zeichensatz. +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 @@ -80,7 +77,7 @@ DeutenEnglischenPost: ld a, [hl] cp "'s" jr nz, .check_intermediate_chars - ld a, $dc + ld a, $dc ; 's in French/German font jr .replace .check_intermediate_chars @@ -99,15 +96,12 @@ DeutenEnglischenPost: jr nz, .loop ret -HandleSpanishItalianMail: -LeerCorreosIngleses: -LeggiPostaInglese: -; This function converts certain characters between -; the English and Spanish/Italian character sets. -; Esta función convierte ciertos caracteres entre -; el juego de caracteres Inglés y Español. -; Questa funzione converte alcuni caratteri tra -; l'inglese e il set di caratteri italiani. +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 |