diff options
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/breeding.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/european_mail.asm | 34 | ||||
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 12 | ||||
| -rw-r--r-- | engine/pokemon/move_mon.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/party_menu.asm | 4 |
5 files changed, 25 insertions, 31 deletions
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 34a0f2bbe..9751a90cf 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -869,7 +869,7 @@ DayCareMon1: ld a, [wDayCareLady] bit DAYCARELADY_HAS_MON_F, a jr z, DayCareMonCursor - call ButtonSound + call PromptButton ld hl, wBreedMon2Nick call DayCareMonCompatibilityText jp PrintText @@ -882,7 +882,7 @@ DayCareMon2: ld a, [wDayCareMan] bit DAYCAREMAN_HAS_MON_F, a jr z, DayCareMonCursor - call ButtonSound + call PromptButton ld hl, wBreedMon1Nick call DayCareMonCompatibilityText jp PrintText 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 diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 0b19dcb14..f6fee4b9c 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -877,7 +877,7 @@ MoveScreenLoop: inc a ld [wPartyMenuCursor], a call SetUpMoveScreenBG - call Function132d3 + call PlaceMoveScreenArrows ld de, MoveScreenAttributes call SetMenuAttributes .loop @@ -1228,12 +1228,12 @@ String_MoveAtk: String_MoveNoPower: db "---@" -Function132d3: - call Function132da - call Function132fe +PlaceMoveScreenArrows: + call PlaceMoveScreenLeftArrow + call PlaceMoveScreenRightArrow ret -Function132da: +PlaceMoveScreenLeftArrow: ld a, [wCurPartyMon] and a ret z @@ -1262,7 +1262,7 @@ Function132da: ld [hl], "◀" ret -Function132fe: +PlaceMoveScreenRightArrow: ld a, [wCurPartyMon] inc a ld c, a diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index eb5afa9dc..8133e2671 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -132,7 +132,7 @@ rept NUM_MOVES + -1 ld [hli], a endr ld [hl], a - ld [wBuffer1], a + ld [wEvolutionOldSpecies], a predef FillMoves .next diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 49c2c4713..12036497d 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -246,10 +246,10 @@ PlacePartyMonLevel: jr nc, .ThreeDigits ld a, "<LV>" ld [hli], a - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 ; jr .okay .ThreeDigits: - lb bc, PRINTNUM_RIGHTALIGN | 1, 3 + lb bc, PRINTNUM_LEFTALIGN | 1, 3 ; .okay call PrintNum |