mirror of
https://github.com/pret/pokeemerald.git
synced 2026-09-26 13:23:14 -04:00
Some updates
This commit is contained in:
@@ -39,6 +39,8 @@
|
||||
#define ENGLISH 1
|
||||
#endif
|
||||
|
||||
#define EUROPE (FRENCH || ITALIAN || SPANISH)
|
||||
|
||||
#if ENGLISH
|
||||
#define UNITS_IMPERIAL
|
||||
#define CHAR_DEC_SEPARATOR CHAR_PERIOD // Period is used as a decimal separator only in the UK and the US.
|
||||
|
||||
+1
-1
@@ -2487,7 +2487,7 @@ extern const u8 gText_MrStoneMatchCallDesc[];
|
||||
extern const u8 gText_MrStoneMatchCallName[];
|
||||
extern const u8 gText_StevenMatchCallDesc[];
|
||||
extern const u8 gText_StevenMatchCallName[];
|
||||
#if FRENCH || ITALIAN
|
||||
#if EUROPE
|
||||
extern const u8 gText_BrendanMatchCallDesc[];
|
||||
extern const u8 gText_MayMatchCallDesc[];
|
||||
#else //ENGLISH
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "constants/trainers.h"
|
||||
|
||||
|
||||
#if FRENCH || ITALIAN
|
||||
#if EUROPE
|
||||
#define MAY_MATCH_CALL_DESC gText_MayMatchCallDesc
|
||||
#define BRENDAN_MATCH_CALL_DESC gText_BrendanMatchCallDesc
|
||||
#else //ENGLISH
|
||||
|
||||
@@ -586,7 +586,7 @@ static void CreateStarterPokemonLabel(u8 selection)
|
||||
sStarterLabelWindowId = AddWindow(&winTemplate);
|
||||
FillWindowPixelBuffer(sStarterLabelWindowId, PIXEL_FILL(0));
|
||||
|
||||
#if FRENCH || ITALIAN
|
||||
#if EUROPE
|
||||
width = GetStringCenterAlignXOffset(FONT_NORMAL, speciesName, 104);
|
||||
AddTextPrinterParameterized3(sStarterLabelWindowId, FONT_NORMAL, width, 1, sTextColors, 0, speciesName);
|
||||
|
||||
|
||||
+1798
File diff suppressed because it is too large
Load Diff
@@ -130,7 +130,73 @@ const u8 gText_UnionRoomChatKeyboard_Emoji8[] = _("{EMOJI_CIRCLE}{EMOJI_TRIANGLE
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji9[] = _("{EMOJI_NOTE}{EMOJI_PLUS}{EMOJI_MINUS}{EMOJI_EQUALS}{EMOJI_PIPE}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji10[] = _("{EMOJI_HIGHBAR}{EMOJI_UNDERSCORE}{EMOJI_SEMICOLON}: ");
|
||||
|
||||
#elif SPANISH
|
||||
|
||||
// Easy Chat keyboard
|
||||
const u8 gText_EasyChatKeyboard_ABCDEFothers[] = _("{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}otros");
|
||||
const u8 gText_EasyChatKeyboard_GHIJKL[] = _("{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L");
|
||||
const u8 gText_EasyChatKeyboard_MNOPQRS[] = _("{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} ");
|
||||
const u8 gText_EasyChatKeyboard_TUVWXYZ[] = _("{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} ");
|
||||
|
||||
// Naming Screen keyboard
|
||||
const u8 gText_NamingScreenKeyboard_abcdef[] = _("{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 29}.");
|
||||
const u8 gText_NamingScreenKeyboard_ghijkl[] = _("{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 29},");
|
||||
const u8 gText_NamingScreenKeyboard_mnopqrs[] = _("{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} ");
|
||||
const u8 gText_NamingScreenKeyboard_tuvwxyz[] = _("{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} ");
|
||||
const u8 gText_NamingScreenKeyboard_ABCDEF[] = _("{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 29}.");
|
||||
const u8 gText_NamingScreenKeyboard_GHIJKL[] = _("{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 29},");
|
||||
const u8 gText_NamingScreenKeyboard_MNOPQRS[] = _("{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} ");
|
||||
const u8 gText_NamingScreenKeyboard_TUVWXYZ[] = _("{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} ");
|
||||
const u8 gText_NamingScreenKeyboard_01234[] = _("{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} ");
|
||||
const u8 gText_NamingScreenKeyboard_56789[] = _("{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} ");
|
||||
const u8 gText_NamingScreenKeyboard_Symbols1[] = _("{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-");
|
||||
const u8 gText_NamingScreenKeyboard_Symbols2[] = _("{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}’{CLEAR 18} ");
|
||||
|
||||
// Union Room Chat keyboard
|
||||
const u8 gText_UnionRoomChatKeyboard_ABCDE[] = _("ABCDE");
|
||||
const u8 gText_UnionRoomChatKeyboard_FGHIJ[] = _("FGHIJ");
|
||||
const u8 gText_UnionRoomChatKeyboard_KLMNO[] = _("KLMNÑ");
|
||||
const u8 gText_UnionRoomChatKeyboard_PQRST[] = _("OPQRS");
|
||||
const u8 gText_UnionRoomChatKeyboard_UVWXY[] = _("TUVWX");
|
||||
const u8 gText_UnionRoomChatKeyboard_Z[] = _("YZ.,Ü");
|
||||
const u8 gText_UnionRoomChatKeyboard_01234Upper[] = _("ÁÉÍÓÚ");
|
||||
const u8 gText_UnionRoomChatKeyboard_56789Upper[] = _("01234");
|
||||
const u8 gText_UnionRoomChatKeyboard_PunctuationUpper[] = _("56789");
|
||||
const u8 gText_UnionRoomChatKeyboard_SymbolsUpper[] = _("¡!¿? ");
|
||||
const u8 gText_UnionRoomChatKeyboard_abcde[] = _("abcde");
|
||||
const u8 gText_UnionRoomChatKeyboard_fghij[] = _("fghij");
|
||||
const u8 gText_UnionRoomChatKeyboard_klmno[] = _("klmnñ");
|
||||
const u8 gText_UnionRoomChatKeyboard_pqrst[] = _("opqrs");
|
||||
const u8 gText_UnionRoomChatKeyboard_uvwxy[] = _("tuvwx");
|
||||
const u8 gText_UnionRoomChatKeyboard_z[] = _("yz.,ü");
|
||||
const u8 gText_UnionRoomChatKeyboard_01234Lower[] = _("áéíóú");
|
||||
const u8 gText_UnionRoomChatKeyboard_56789Lower[] = _("01234");
|
||||
const u8 gText_UnionRoomChatKeyboard_PunctuationLower[] = _("56789");
|
||||
const u8 gText_UnionRoomChatKeyboard_SymbolsLower[] = _("¡!¿? ");
|
||||
|
||||
const u8 gText_EmptyTextInput1[] = _("");
|
||||
const u8 gText_EmptyTextInput2[] = _("");
|
||||
const u8 gText_EmptyTextInput3[] = _("");
|
||||
const u8 gText_EmptyTextInput4[] = _("");
|
||||
const u8 gText_EmptyTextInput5[] = _("");
|
||||
const u8 gText_EmptyTextInput6[] = _("");
|
||||
const u8 gText_EmptyTextInput7[] = _("");
|
||||
const u8 gText_EmptyTextInput8[] = _("");
|
||||
|
||||
// Union Room Chat keyboard emojis
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji1[] = _("{EMOJI_MISCHIEVOUS}{EMOJI_HAPPY}{EMOJI_ANGRY}{EMOJI_SURPRISED}{EMOJI_BIGANGER}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji2[] = _("{EMOJI_BIGSMILE}{EMOJI_EVIL}{EMOJI_NEUTRAL}{EMOJI_TIRED}{EMOJI_SHOCKED}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji3[] = _("{EMOJI_LEAF}{EMOJI_FIRE}{EMOJI_WATER}{EMOJI_BOLT}{EMOJI_BALL}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji4[] = _("♂♀{EMOJI_LEFT_PAREN}{EMOJI_RIGHT_PAREN}{EMOJI_TILDE}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji5[] = _("{EMOJI_LEFT_EYE}{EMOJI_RIGHT_EYE}{EMOJI_SMALLWHEEL}{EMOJI_SPHERE}{EMOJI_IRRITATED}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji6[] = _("{EMOJI_SPIRAL}{EMOJI_BIGWHEEL}{EMOJI_TONGUE}{EMOJI_ACUTE}{EMOJI_GRAVE}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji7[] = _("{EMOJI_RIGHT_FIST}{EMOJI_LEFT_FIST}{EMOJI_TRIANGLE_OUTLINE}{EMOJI_UNION}{EMOJI_GREATER_THAN}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji8[] = _("{EMOJI_CIRCLE}{EMOJI_TRIANGLE}{EMOJI_SQUARE}{EMOJI_HEART}{EMOJI_MOON}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji9[] = _("{EMOJI_NOTE}{EMOJI_PLUS}{EMOJI_MINUS}{EMOJI_EQUALS}{EMOJI_PIPE}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji10[] = _("{EMOJI_HIGHBAR}{EMOJI_UNDERSCORE}{EMOJI_SEMICOLON}: ");
|
||||
|
||||
#else //ENGLISH
|
||||
|
||||
// Easy Chat keyboard
|
||||
const u8 gText_EasyChatKeyboard_ABCDEFothers[] = _("{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others");
|
||||
const u8 gText_EasyChatKeyboard_GHIJKL[] = _("{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L");
|
||||
|
||||
+3
-3
@@ -39,7 +39,7 @@ enum {
|
||||
WIN_TRAINER_PIC,
|
||||
};
|
||||
|
||||
#if ITALIAN
|
||||
#if ITALIAN || SPANISH
|
||||
#define CARD_NAME_BACK_LEFT 148
|
||||
#else //ENGLISH || FRENCH
|
||||
#define CARD_NAME_BACK_LEFT 136
|
||||
@@ -1530,8 +1530,8 @@ static void DrawStarsAndBadgesOnCard(void)
|
||||
|
||||
static void DrawCardBackStats(void)
|
||||
{
|
||||
// For some reason this function is emptied out in the French and Italian versions
|
||||
#if !defined(FRENCH) && !defined(ITALIAN)
|
||||
// For some reason this function is emptied out in the European versions
|
||||
#if !EUROPE
|
||||
if (sData->cardType == CARD_TYPE_FRLG)
|
||||
{
|
||||
if (sData->hasTrades)
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@
|
||||
#include "constants/rgb.h"
|
||||
#include "constants/songs.h"
|
||||
|
||||
#if FRENCH || ITALIAN
|
||||
#if EUROPE
|
||||
#define TRADE_BOARD_FONT FONT_SMALL
|
||||
#else //ENGLISH
|
||||
#define TRADE_BOARD_FONT FONT_NORMAL
|
||||
|
||||
Reference in New Issue
Block a user