diff --git a/src/berry.c b/src/berry.c index 5ff3e348c7..5c4135bcfc 100644 --- a/src/berry.c +++ b/src/berry.c @@ -198,6 +198,93 @@ static const u8 sBerryDescriptionPart1_Starf[] = _("Quasi mai usata per il suo s static const u8 sBerryDescriptionPart2_Starf[] = _("forte. È considerata un miraggio."); static const u8 sBerryDescriptionPart1_Enigma[] = _("BACCA altamente enigmatica."); static const u8 sBerryDescriptionPart2_Enigma[] = _("Pare possedere la forza delle stelle."); +#elif SPANISH +static const u8 sBerryDescriptionPart1_Cheri[] = _("Florece con bellas y delicadas flores."); +static const u8 sBerryDescriptionPart2_Cheri[] = _("Es de color rojo vivo y sabor picante."); +static const u8 sBerryDescriptionPart1_Chesto[] = _("Tiene la cáscara y el fruto duros."); +static const u8 sBerryDescriptionPart2_Chesto[] = _("No es nada jugosa."); +static const u8 sBerryDescriptionPart1_Pecha[] = _("Es dulce, rica y muy tierna."); +static const u8 sBerryDescriptionPart2_Pecha[] = _("Es muy delicada."); +static const u8 sBerryDescriptionPart1_Rawst[] = _("Si las hojas crecen mucho y se rizan,"); +static const u8 sBerryDescriptionPart2_Rawst[] = _("el sabor de la BAYA se vuelve amargo."); +static const u8 sBerryDescriptionPart1_Aspear[] = _("Esta BAYA es dura y densa."); +static const u8 sBerryDescriptionPart2_Aspear[] = _("Da mucho zumo. Sabe bastante ácida."); +static const u8 sBerryDescriptionPart1_Leppa[] = _("Crece más despacio que otras BAYAS."); +static const u8 sBerryDescriptionPart2_Leppa[] = _("Cuanto más pequeña, más sabrosa."); +static const u8 sBerryDescriptionPart1_Oran[] = _("Es una BAYA particular. Crece en"); +static const u8 sBerryDescriptionPart2_Oran[] = _("medio día y tiene mezcla de sabores."); +static const u8 sBerryDescriptionPart1_Persim[] = _("Le encanta el sol. Si está expuesta"); +static const u8 sBerryDescriptionPart2_Persim[] = _("a él, el color de la piel se intensifica."); +static const u8 sBerryDescriptionPart1_Lum[] = _("Crece despacio. Si se cuida"); +static const u8 sBerryDescriptionPart2_Lum[] = _("con cariño, puede dar dos brotes."); +static const u8 sBerryDescriptionPart1_Sitrus[] = _("Es de la familia de la ARANJA."); +static const u8 sBerryDescriptionPart2_Sitrus[] = _("Tiene un sabor bastante redondo."); +static const u8 sBerryDescriptionPart1_Figy[] = _("Tiene pinta de estar ya masticada."); +static const u8 sBerryDescriptionPart2_Figy[] = _("La pulpa tiene un sabor muy intenso."); +static const u8 sBerryDescriptionPart1_Wiki[] = _("Dicen que crece granulosa para que"); +static const u8 sBerryDescriptionPart2_Wiki[] = _("los POKéMON puedan agarrarla mejor."); +static const u8 sBerryDescriptionPart1_Mago[] = _("Se va curvando durante su desarrollo"); +static const u8 sBerryDescriptionPart2_Mago[] = _("tornándose más dulce y sabrosa."); +static const u8 sBerryDescriptionPart1_Aguav[] = _("La flor es exquisita. Su habilidad"); +static const u8 sBerryDescriptionPart2_Aguav[] = _("para crecer sin luz la hace única."); +static const u8 sBerryDescriptionPart1_Iapapa[] = _("La BAYA es muy grande y ácida."); +static const u8 sBerryDescriptionPart2_Iapapa[] = _("Tarda al menos un día en crecer."); +static const u8 sBerryDescriptionPart1_Razz[] = _("La BAYA es roja y un pelín picante."); +static const u8 sBerryDescriptionPart2_Razz[] = _("Crece rápido, en sólo cuatro horas."); +static const u8 sBerryDescriptionPart1_Bluk[] = _("Por fuera es azul, pero te teñirá"); +static const u8 sBerryDescriptionPart2_Bluk[] = _("de negro la boca si te la comes."); +static const u8 sBerryDescriptionPart1_Nanab[] = _("Ésta es la séptima BAYA descubierta"); +static const u8 sBerryDescriptionPart2_Nanab[] = _("en todo el mundo. Es muy dulce."); +static const u8 sBerryDescriptionPart1_Wepear[] = _("La flor es pequeña y blanca. Tiene un"); +static const u8 sBerryDescriptionPart2_Wepear[] = _("punto ácido y amargo al mismo tiempo."); +static const u8 sBerryDescriptionPart1_Pinap[] = _("Es muy débil ante el frío y el viento."); +static const u8 sBerryDescriptionPart2_Pinap[] = _("La pulpa es picante; y la piel, ácida."); +static const u8 sBerryDescriptionPart1_Pomeg[] = _("Se use la cantidad de agua que se use,"); +static const u8 sBerryDescriptionPart2_Pomeg[] = _("siempre crecen seis BAYAS."); +static const u8 sBerryDescriptionPart1_Kelpsy[] = _("Ésta es una especie muy rara. Tiene"); +static const u8 sBerryDescriptionPart2_Kelpsy[] = _("forma de raíz y da una flor grande."); +static const u8 sBerryDescriptionPart1_Qualot[] = _("Le encanta el agua. Crece más fuerte"); +static const u8 sBerryDescriptionPart2_Qualot[] = _("donde hay continuas precipitaciones."); +static const u8 sBerryDescriptionPart1_Hondew[] = _("Es una BAYA carísima y muy poco"); +static const u8 sBerryDescriptionPart2_Hondew[] = _("frecuente. Está exquisita."); +static const u8 sBerryDescriptionPart1_Grepa[] = _("Es tierna y redondita, pero de una"); +static const u8 sBerryDescriptionPart2_Grepa[] = _("acidez increíble."); +static const u8 sBerryDescriptionPart1_Tamato[] = _("Está tan picante que hace que te arda"); +static const u8 sBerryDescriptionPart2_Tamato[] = _("la boca. Tarda mucho en crecer."); +static const u8 sBerryDescriptionPart1_Cornn[] = _("Data de tiempos remotos. Puede que"); +static const u8 sBerryDescriptionPart2_Cornn[] = _("no crezca si no se plantan muchas."); +static const u8 sBerryDescriptionPart1_Magost[] = _("Todo el mundo dice que su sabor"); +static const u8 sBerryDescriptionPart2_Magost[] = _("guarda un equilibrio exquisito."); +static const u8 sBerryDescriptionPart1_Rabuta[] = _("Variedad muy poco común, recubierta"); +static const u8 sBerryDescriptionPart2_Rabuta[] = _("de pelusa, y de sabor muy amargo."); +static const u8 sBerryDescriptionPart1_Nomel[] = _("Es muy ácida. Con sólo darle un bocado,"); +static const u8 sBerryDescriptionPart2_Nomel[] = _("te deja sin paladar tres días."); +static const u8 sBerryDescriptionPart1_Spelon[] = _("Es de color rojo fuerte. Por los gránu-"); +static const u8 sBerryDescriptionPart2_Spelon[] = _("los de la piel segrega jugo picante."); +static const u8 sBerryDescriptionPart1_Pamtre[] = _("No se está seguro de su procedencia."); +static const u8 sBerryDescriptionPart2_Pamtre[] = _("Flota a la deriva por el mar."); +static const u8 sBerryDescriptionPart1_Watmel[] = _("Es enorme. Algunas miden más de medio"); +static const u8 sBerryDescriptionPart2_Watmel[] = _("metro. Es tremendamente dulce."); +static const u8 sBerryDescriptionPart1_Durin[] = _("Resulta amarga sólo con verla."); +static const u8 sBerryDescriptionPart2_Durin[] = _("Nadie se ha atrevido a probarla sola."); +static const u8 sBerryDescriptionPart1_Belue[] = _("Es brillante y tiene buena pinta, pero"); +static const u8 sBerryDescriptionPart2_Belue[] = _("es más que ácida. Tarda en crecer."); +static const u8 sBerryDescriptionPart1_Liechi[] = _("Es misteriosa. Se dice que contiene"); +static const u8 sBerryDescriptionPart2_Liechi[] = _("la fuerza del mar."); +static const u8 sBerryDescriptionPart1_Ganlon[] = _("Es intrigante. Se dice que contiene"); +static const u8 sBerryDescriptionPart2_Ganlon[] = _("la fuerza de la tierra."); +static const u8 sBerryDescriptionPart1_Salac[] = _("Es muy rara. Se dice que contiene"); +static const u8 sBerryDescriptionPart2_Salac[] = _("la fuerza del cielo."); +static const u8 sBerryDescriptionPart1_Petaya[] = _("Es misteriosa. Se dice que contiene"); +static const u8 sBerryDescriptionPart2_Petaya[] = _("la fuerza de la vida."); +static const u8 sBerryDescriptionPart1_Apicot[] = _("Es extraña. No se sabe qué efectos"); +static const u8 sBerryDescriptionPart2_Apicot[] = _("puede tener ni cómo se puede usar."); +static const u8 sBerryDescriptionPart1_Lansat[] = _("Se dice que es una BAYA legendaria."); +static const u8 sBerryDescriptionPart2_Lansat[] = _("Puede que haga feliz a su portador."); +static const u8 sBerryDescriptionPart1_Starf[] = _("Es tan fuerte que la dejaron en los"); +static const u8 sBerryDescriptionPart2_Starf[] = _("confines del mundo. ¿Será de verdad?"); +static const u8 sBerryDescriptionPart1_Enigma[] = _("Es enigmática. Dicen que encierra"); +static const u8 sBerryDescriptionPart2_Enigma[] = _("la fuerza de las estrellas."); #else //ENGLISH static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers."); static const u8 sBerryDescriptionPart2_Cheri[] = _("The bright red BERRY is very spicy."); @@ -291,10 +378,7 @@ const struct Berry gBerries[] = { [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "CHERI", - "CERIZ", - "LIEGIA"), + .name = LANGUAGE_STRING("CHERI", "CERIZ", "LIEGIA", "ZREZA"), .firmness = BERRY_FIRMNESS_SOFT, .size = 20, .maxYield = 3, @@ -312,10 +396,7 @@ const struct Berry gBerries[] = [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "CHESTO", - "MARON", - "STAGNA"), + .name = LANGUAGE_STRING("CHESTO", "MARON", "STAGNA", "ATANIA"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 80, .maxYield = 3, @@ -333,10 +414,7 @@ const struct Berry gBerries[] = [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "PECHA", - "PECHA", - "PESCA"), + .name = LANGUAGE_STRING("PECHA", "PECHA", "PESCA", "MELOC"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 40, .maxYield = 3, @@ -354,10 +432,7 @@ const struct Berry gBerries[] = [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "RAWST", - "FRAIVE", - "FRAGO"), + .name = LANGUAGE_STRING("RAWST", "FRAIVE", "FRAGO", "SAFRE"), .firmness = BERRY_FIRMNESS_HARD, .size = 32, .maxYield = 3, @@ -375,10 +450,7 @@ const struct Berry gBerries[] = [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "ASPEAR", - "WILLIA", - "PERINA"), + .name = LANGUAGE_STRING("ASPEAR", "WILLIA", "PERINA", "PERASI"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 50, .maxYield = 3, @@ -396,10 +468,7 @@ const struct Berry gBerries[] = [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "LEPPA", - "MEPO", - "MELA"), + .name = LANGUAGE_STRING("LEPPA", "MEPO", "MELA", "ZANAMA"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 28, .maxYield = 3, @@ -417,10 +486,7 @@ const struct Berry gBerries[] = [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "ORAN", - "ORAN", - "RANCIA"), + .name = LANGUAGE_STRING("ORAN", "ORAN", "RANCIA", "ARANJA"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 35, .maxYield = 3, @@ -438,10 +504,7 @@ const struct Berry gBerries[] = [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "PERSIM", - "KIKA", - "KI"), + .name = LANGUAGE_STRING("PERSIM", "KIKA", "KI", "CAQUIC"), .firmness = BERRY_FIRMNESS_HARD, .size = 47, .maxYield = 3, @@ -459,10 +522,7 @@ const struct Berry gBerries[] = [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "LUM", - "PRINE", - "PRUGNA"), + .name = LANGUAGE_STRING("LUM", "PRINE", "PRUGNA", "ZIUELA"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 34, .maxYield = 2, @@ -480,10 +540,7 @@ const struct Berry gBerries[] = [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "SITRUS", - "SITRUS", - "CEDRO"), + .name = LANGUAGE_STRING("SITRUS", "SITRUS", "CEDRO", "ZIDRA"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 95, .maxYield = 3, @@ -501,10 +558,7 @@ const struct Berry gBerries[] = [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "FIGY", - "FIGUY", - "FICO"), + .name = LANGUAGE_STRING("FIGY", "FIGUY", "FICO", "HIGOG"), .firmness = BERRY_FIRMNESS_SOFT, .size = 100, .maxYield = 3, @@ -522,10 +576,7 @@ const struct Berry gBerries[] = [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "WIKI", - "WIKI", - "KIWI"), + .name = LANGUAGE_STRING("WIKI", "WIKI", "KIWI", "WIKI"), .firmness = BERRY_FIRMNESS_HARD, .size = 115, .maxYield = 3, @@ -543,10 +594,7 @@ const struct Berry gBerries[] = [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "MAGO", - "MAGO", - "MANGO"), + .name = LANGUAGE_STRING("MAGO", "MAGO", "MANGO", "ANGO"), .firmness = BERRY_FIRMNESS_HARD, .size = 126, .maxYield = 3, @@ -564,10 +612,7 @@ const struct Berry gBerries[] = [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "AGUAV", - "GOWAV", - "GUAVA"), + .name = LANGUAGE_STRING("AGUAV", "GOWAV", "GUAVA", "GUAYA"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 64, .maxYield = 3, @@ -585,10 +630,7 @@ const struct Berry gBerries[] = [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "IAPAPA", - "PAPAYA", - "PAIA"), + .name = LANGUAGE_STRING("IAPAPA", "PAPAYA", "PAIA", "PABAYA"), .firmness = BERRY_FIRMNESS_SOFT, .size = 223, .maxYield = 3, @@ -606,10 +648,7 @@ const struct Berry gBerries[] = [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "RAZZ", - "FRAMBY", - "LAMPON"), + .name = LANGUAGE_STRING("RAZZ", "FRAMBY", "LAMPON", "FRAMBU"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 120, .maxYield = 6, @@ -627,10 +666,7 @@ const struct Berry gBerries[] = [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "BLUK", - "REMU", - "MORA"), + .name = LANGUAGE_STRING("BLUK", "REMU", "MORA", "ORAM"), .firmness = BERRY_FIRMNESS_SOFT, .size = 108, .maxYield = 6, @@ -648,10 +684,7 @@ const struct Berry gBerries[] = [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "NANAB", - "NANAB", - "BANA"), + .name = LANGUAGE_STRING("NANAB", "NANAB", "BANA", "LATANO"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 77, .maxYield = 6, @@ -669,10 +702,7 @@ const struct Berry gBerries[] = [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "WEPEAR", - "REPOI", - "PERA"), + .name = LANGUAGE_STRING("WEPEAR", "REPOI", "PERA", "PERAGU"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 74, .maxYield = 6, @@ -690,10 +720,7 @@ const struct Berry gBerries[] = [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "PINAP", - "NANANA", - "NANAS"), + .name = LANGUAGE_STRING("PINAP", "NANANA", "NANAS", "PINIA"), .firmness = BERRY_FIRMNESS_HARD, .size = 80, .maxYield = 6, @@ -711,10 +738,7 @@ const struct Berry gBerries[] = [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "POMEG", - "GRENA", - "GRANA"), + .name = LANGUAGE_STRING("POMEG", "GRENA", "GRANA", "GRANA"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 135, .maxYield = 6, @@ -732,10 +756,7 @@ const struct Berry gBerries[] = [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "KELPSY", - "ALGA", - "LGA"), + .name = LANGUAGE_STRING("KELPSY", "ALGA", "LGA", "ALGAMA"), .firmness = BERRY_FIRMNESS_HARD, .size = 150, .maxYield = 6, @@ -753,10 +774,7 @@ const struct Berry gBerries[] = [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "QUALOT", - "QUALOT", - "LOQUAT"), + .name = LANGUAGE_STRING("QUALOT", "QUALOT", "LOQUAT", "ISPERO"), .firmness = BERRY_FIRMNESS_HARD, .size = 110, .maxYield = 6, @@ -774,10 +792,7 @@ const struct Berry gBerries[] = [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "HONDEW", - "LONME", - "MELON"), + .name = LANGUAGE_STRING("HONDEW", "LONME", "MELON", "MELUCE"), .firmness = BERRY_FIRMNESS_HARD, .size = 162, .maxYield = 6, @@ -795,10 +810,7 @@ const struct Berry gBerries[] = [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "GREPA", - "RESIN", - "UVA"), + .name = LANGUAGE_STRING("GREPA", "RESIN", "UVA", "UVAV"), .firmness = BERRY_FIRMNESS_SOFT, .size = 149, .maxYield = 6, @@ -816,10 +828,7 @@ const struct Berry gBerries[] = [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "TAMATO", - "TAMATO", - "MODORO"), + .name = LANGUAGE_STRING("TAMATO", "TAMATO", "MODORO", "TAMATE"), .firmness = BERRY_FIRMNESS_SOFT, .size = 200, .maxYield = 4, @@ -837,10 +846,7 @@ const struct Berry gBerries[] = [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "CORNN", - "SIAM", - "VENA"), + .name = LANGUAGE_STRING("CORNN", "SIAM", "VENA", "MAIS"), .firmness = BERRY_FIRMNESS_HARD, .size = 75, .maxYield = 4, @@ -858,10 +864,7 @@ const struct Berry gBerries[] = [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "MAGOST", - "MANGOU", - "GOSTAN"), + .name = LANGUAGE_STRING("MAGOST", "MANGOU", "GOSTAN", "AOSTAN"), .firmness = BERRY_FIRMNESS_HARD, .size = 140, .maxYield = 4, @@ -879,10 +882,7 @@ const struct Berry gBerries[] = [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "RABUTA", - "RABUTA", - "MBUTAN"), + .name = LANGUAGE_STRING("RABUTA", "RABUTA", "MBUTAN", "RAUTAN"), .firmness = BERRY_FIRMNESS_SOFT, .size = 226, .maxYield = 4, @@ -900,10 +900,7 @@ const struct Berry gBerries[] = [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "NOMEL", - "TRONCI", - "LEMON"), + .name = LANGUAGE_STRING("NOMEL", "TRONCI", "LEMON", "MONLI"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 285, .maxYield = 4, @@ -921,10 +918,7 @@ const struct Berry gBerries[] = [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "SPELON", - "KIWAN", - "MELOS"), + .name = LANGUAGE_STRING("SPELON", "KIWAN", "MELOS", "WIKANO"), .firmness = BERRY_FIRMNESS_SOFT, .size = 133, .maxYield = 2, @@ -942,10 +936,7 @@ const struct Berry gBerries[] = [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "PAMTRE", - "PALMA", - "PALMA"), + .name = LANGUAGE_STRING("PAMTRE", "PALMA", "PALMA", "PLAMA"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 244, .maxYield = 2, @@ -963,10 +954,7 @@ const struct Berry gBerries[] = [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "WATMEL", - "STEKPA", - "COMERO"), + .name = LANGUAGE_STRING("WATMEL", "STEKPA", "COMERO", "SAMBIA"), .firmness = BERRY_FIRMNESS_SOFT, .size = 250, .maxYield = 2, @@ -984,10 +972,7 @@ const struct Berry gBerries[] = [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "DURIN", - "DURIN", - "DURIAN"), + .name = LANGUAGE_STRING("DURIN", "DURIN", "DURIAN", "RUDION"), .firmness = BERRY_FIRMNESS_HARD, .size = 280, .maxYield = 2, @@ -1005,10 +990,7 @@ const struct Berry gBerries[] = [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "BELUE", - "MYRTE", - "RTILLO"), + .name = LANGUAGE_STRING("BELUE", "MYRTE", "RTILLO", "ANDANO"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .size = 300, .maxYield = 2, @@ -1026,10 +1008,7 @@ const struct Berry gBerries[] = [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "LIECHI", - "LICHII", - "LICI"), + .name = LANGUAGE_STRING("LIECHI", "LICHII", "LICI", "LICHI"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 111, .maxYield = 2, @@ -1047,10 +1026,7 @@ const struct Berry gBerries[] = [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "GANLON", - "LINGAN", - "LONGAN"), + .name = LANGUAGE_STRING("GANLON", "LINGAN", "LONGAN", "GONLAN"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 33, .maxYield = 2, @@ -1068,10 +1044,7 @@ const struct Berry gBerries[] = [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "SALAC", - "SAILAK", - "SALAK"), + .name = LANGUAGE_STRING("SALAC", "SAILAK", "SALAK", "ASLAC"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 95, .maxYield = 2, @@ -1089,10 +1062,7 @@ const struct Berry gBerries[] = [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "PETAYA", - "PITAYE", - "PITAYA"), + .name = LANGUAGE_STRING("PETAYA", "PITAYE", "PITAYA", "YAPATI"), .firmness = BERRY_FIRMNESS_VERY_HARD, .size = 237, .maxYield = 2, @@ -1110,10 +1080,7 @@ const struct Berry gBerries[] = [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "APICOT", - "ABRIKO", - "COCCA"), + .name = LANGUAGE_STRING("APICOT", "ABRIKO", "COCCA", "ARICOC"), .firmness = BERRY_FIRMNESS_HARD, .size = 75, .maxYield = 2, @@ -1131,10 +1098,7 @@ const struct Berry gBerries[] = [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "LANSAT", - "LANSAT", - "LANGSA"), + .name = LANGUAGE_STRING("LANSAT", "LANSAT", "LANGSA", "ZONLAN"), .firmness = BERRY_FIRMNESS_SOFT, .size = 97, .maxYield = 2, @@ -1152,10 +1116,7 @@ const struct Berry gBerries[] = [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = { - .name = LANGUAGE_STRING( - "STARF", - "FRISTA", - "MBOLA"), + .name = LANGUAGE_STRING("STARF", "FRISTA", "MBOLA", "ARABOL"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .size = 153, .maxYield = 2, diff --git a/src/berry_blender.c b/src/berry_blender.c index ca300f2cb9..11cb631cf9 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -248,12 +248,13 @@ static s16 sDebug_GameTimeStage; COMMON_DATA u8 gInGameOpponentsNo = 0; +#if !EUROPE +static const u16 gBlenderCenter_Pal[] = INCBIN_U16("graphics/berry_blender/center.gbapal"); +#endif +static const u8 sBlenderCenter_Tilemap[] = INCBIN_U8("graphics/berry_blender/center_map.bin"); #if FRENCH || ITALIAN -static const u8 sBlenderCenter_Tilemap[] = INCBIN_U8("graphics/berry_blender/center_map.bin"); static const u16 sBlenderOuter_Pal[] = INCBIN_U16("graphics/berry_blender/french/outer.gbapal"); -#else //ENGLISH -static const u16 sBlenderCenter_Pal[] = INCBIN_U16("graphics/berry_blender/center.gbapal"); -static const u8 sBlenderCenter_Tilemap[] = INCBIN_U8("graphics/berry_blender/center_map.bin"); +#else //ENGLISH || SPANISH static const u16 sBlenderOuter_Pal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal"); #endif @@ -294,6 +295,23 @@ static const u8 sText_Lassie[] = _("MILLO"); static const u8 sText_Master[] = _("MAESTRO"); static const u8 sText_Dude[] = _("RAGAZZO"); static const u8 sText_Miss[] = _("RAGAZZA"); +#elif SPANISH +// unused text +static const u8 sUnusedText_YesNo[] = _("SÍ\nNO"); +static const u8 sUnusedText_2[] = _("▶"); +static const u8 sUnusedText_Space[] = _(" "); +static const u8 sUnusedText_Terminating[] = _("Terminando…"); +static const u8 sUnusedText_LinkPartnerNotFound[] = _("No se han encontrado otros jugadores.\nInténtalo de nuevo.\p"); + +static const u8 sText_BerryBlenderStart[] = _("Encendiendo la LICUABAYAS…\pSaca una BAYA de la MOCHILA\ny échala en la LICUABAYAS.\p"); +static const u8 sText_NewParagraph[] = _("\p"); +static const u8 sText_WasMade[] = _("¡Has hecho un {STR_VAR_1}!"); +static const u8 sText_Mister[] = _("SEÑOR"); +static const u8 sText_Laddie[] = _("CHICO"); +static const u8 sText_Lassie[] = _("CHICA"); +static const u8 sText_Master[] = _("LICUÓLOGO"); +static const u8 sText_Dude[] = _("CHAVAL"); +static const u8 sText_Miss[] = _("SEÑORITA"); #else //ENGLISH // unused text static const u8 sUnusedText_YesNo[] = _("YES\nNO"); @@ -370,6 +388,30 @@ static const u8 sText_Ranking[] = _("CLASSIFICA"); static const u8 sText_TheLevelIs[] = _("Il livello è "); static const u8 sText_TheFeelIs[] = _(" e la fibra è "); static const u8 sText_Dot2[] = _("."); +#elif SPANISH +static const u8 sText_PressAToStart[] = _("Pulsa el Botón A para empezar."); +static const u8 sText_PleaseWaitAWhile[] = _("Espera un momento."); +static const u8 sText_CommunicationStandby[] = _("Esperando conexión…"); +static const u8 sText_WouldLikeToBlendAnotherBerry[] = _("¿Quieres echar otra BAYA?"); +static const u8 sText_RunOutOfBerriesForBlending[] = _("Te has quedado sin BAYAS\npara echar en la LICUABAYAS.\p"); +static const u8 sText_YourPokeblockCaseIsFull[] = _("El TUBO de {POKEBLOCK}S está lleno.\p"); +static const u8 sText_HasNoBerriesToPut[] = _("{STR_VAR_1} no tiene BAYAS para echar\nen la LICUABAYAS."); +static const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("El TUBO de {POKEBLOCK}S de {STR_VAR_1} está lleno.\p"); +static const u8 sText_BlendingResults[] = _("RESULTADOS DE LA MEZCLA"); +static const u8 sText_BerryUsed[] = _("BAYA USADA"); +static const u8 sText_SpaceBerry[] = _("BAYA {STR_VAR_1}"); +static const u8 sText_Time[] = _("TIEMPO"); +static const u8 sText_Min[] = _(" min "); +static const u8 sText_Sec[] = _(" s"); +static const u8 sText_MaximumSpeed[] = _("VELOC. MÁXIMA"); +static const u8 sText_RPM[] = _(" rpm"); +static const u8 sText_Dot[] = _("."); +static const u8 sText_NewLine[] = _("\n"); +static const u8 sText_Space[] = _(" "); +static const u8 sText_Ranking[] = _("CLASIFICACIÓN"); +static const u8 sText_TheLevelIs[] = _("La eficacia es "); +static const u8 sText_TheFeelIs[] = _(" y la masa es "); +static const u8 sText_Dot2[] = _("."); #else //ENGLISH static const u8 sText_PressAToStart[] = _("Press the A Button to start."); static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while."); @@ -1013,7 +1055,7 @@ static const u8 sJPText_Flavors[][5] = {_("からい"), _("しぶい"), _("あ static const u8 sUnused[] = { 6, 6, 6, 6, 5, 3, 3, 3, 2, 2, -#if !defined(FRENCH) && !defined(ITALIAN) +#if !EUROPE 3, 3, 3, 3, 2 }; @@ -1058,11 +1100,7 @@ static bool8 LoadBerryBlenderGfx(void) case 1: CopyToBgTilemapBuffer(2, sBlenderCenter_Tilemap, 0x400, 0); CopyBgTilemapBufferToVram(2); - #if FRENCH || ITALIAN LoadPalette(gBlenderCenter_Pal, BG_PLTT_ID(0), 8 * PLTT_SIZE_4BPP); - #else //ENGLISH - LoadPalette(sBlenderCenter_Pal, BG_PLTT_ID(0), 8 * PLTT_SIZE_4BPP); - #endif sBerryBlender->loadGfxState++; break; case 2: @@ -2943,7 +2981,7 @@ static void CB2_CheckPlayAgainLink(void) case 1: sBerryBlender->gameEndState = 3; StringCopy(gStringVar4, gLinkPlayers[sBerryBlender->canceledPlayerId].name); - #if FRENCH || ITALIAN + #if EUROPE StringAppendWithPlaceholder(gStringVar4, sText_ApostropheSPokeblockCaseIsFull, gStringVar4); #else //ENGLISH StringAppend(gStringVar4, sText_ApostropheSPokeblockCaseIsFull); @@ -2952,7 +2990,7 @@ static void CB2_CheckPlayAgainLink(void) case 2: sBerryBlender->gameEndState++; StringCopy(gStringVar4, gLinkPlayers[sBerryBlender->canceledPlayerId].name); - #if FRENCH || ITALIAN + #if EUROPE StringAppendWithPlaceholder(gStringVar4, sText_HasNoBerriesToPut, gStringVar4); #else //ENGLISH StringAppend(gStringVar4, sText_HasNoBerriesToPut); @@ -3615,7 +3653,7 @@ static bool8 PrintBlendingResults(void) StringCopy(sBerryBlender->stringVar, sBerryBlender->blendedBerries[place].name); ConvertInternationalString(sBerryBlender->stringVar, gLinkPlayers[place].language); - #if FRENCH || ITALIAN + #if EUROPE StringAppendWithPlaceholder(sBerryBlender->stringVar, sText_SpaceBerry, sBerryBlender->stringVar); #else //ENGLISH StringAppend(sBerryBlender->stringVar, sText_SpaceBerry); @@ -3625,7 +3663,7 @@ static bool8 PrintBlendingResults(void) Blender_AddTextPrinter(WIN_RESULTS, sText_MaximumSpeed, 0, 0x51, TEXT_SKIP_DRAW, 3); ConvertIntToDecimalStringN(sBerryBlender->stringVar, sBerryBlender->maxRPM / 100, STR_CONV_MODE_RIGHT_ALIGN, 3); - #if FRENCH || ITALIAN + #if CHAR_DEC_SEPARATOR == CHAR_COMMA { u8 comma[] = _(","); StringAppend(sBerryBlender->stringVar, comma); @@ -3704,8 +3742,8 @@ static bool8 PrintBlendingResults(void) return FALSE; } -#if FRENCH || ITALIAN -static const u8 sUnused2[] = {0x03, 0x03, 0x03, 0x03, 0x02}; +#if EUROPE +static const u8 sUnused2[] = {3, 3, 3, 3, 2}; #endif static void PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst) @@ -3715,7 +3753,7 @@ static void PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst) dst[0] = EOS; StringCopy(dst, gPokeblockNames[pokeblock->color]); -#if FRENCH || ITALIAN +#if EUROPE StringAppendWithPlaceholder(dst, sText_WasMade, dst); #else //ENGLISH StringAppend(dst, sText_WasMade); @@ -3879,7 +3917,8 @@ void ShowBerryBlenderRecordWindow(void) { s32 i; s32 xPos, yPos; -#if FRENCH || ITALIAN + u8 text[32]; +#if EUROPE struct WindowTemplate winTemplate = { .bg = 0, @@ -3890,12 +3929,8 @@ void ShowBerryBlenderRecordWindow(void) .paletteNum = 15, .baseBlock = 8 }; - u8 text[32]; #else //ENGLISH - struct WindowTemplate winTemplate; - u8 text[32]; - - winTemplate = sBlenderRecordWindowTemplate; + struct WindowTemplate winTemplate = sBlenderRecordWindowTemplate; #endif gRecordsWindowId = AddWindow(&winTemplate); DrawStdWindowFrame(gRecordsWindowId, FALSE); @@ -3913,7 +3948,7 @@ void ShowBerryBlenderRecordWindow(void) record = gSaveBlock1Ptr->berryBlenderRecords[i]; txtPtr = ConvertIntToDecimalStringN(text, record / 100, STR_CONV_MODE_RIGHT_ALIGN, 3); - #if FRENCH || ITALIAN + #if CHAR_DEC_SEPARATOR == CHAR_COMMA *txtPtr++ = CHAR_COMMA; *txtPtr = EOS; #else //ENGLISH diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index d0e6a26fde..3406fb9287 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -108,6 +108,44 @@ static const u8 sText_TransmissionFailureTryAgain[] = _( "La trasmissione non è riuscita.\n" "{COLOR 4}{SHADOW 5}Riprova."); +#elif SPANISH + +static const u8 sText_BerryProgramUpdate[] = _("Actualización del programa de bayas"); +static const u8 sText_RubySapphire[] = _("Rubí/Zafiro"); +static const u8 sText_Emerald[] = _("Esmeralda"); +static const u8 sText_BerryProgramWillBeUpdatedPressA[] = _( + "Se va a actualizar el programa\n" + "de bayas del cartucho de Pokémon\n" + "Rubí o Zafiro.\n" + "{COLOR 4}{SHADOW 5}Pulsa el Botón A."); + +static const u8 sText_EnsureGBAConnectionMatches[] = _( + "¿Has conectado las consolas\n" + "como te mostramos?\n" + "{COLOR 4}{SHADOW 5}SÍ: pulsa el Botón A.\n" + "NO: apágalas (OFF) y prueba de nuevo."); + +static const u8 sText_TurnOffPowerHoldingStartSelect[] = _( + "Enciende (ON) la consola del cartucho\n" + "de Pokémon Rubí o Zafiro mientras\n" + "mantienes pulsados START y SELECT\n" + "hasta que aparezca esta imagen."); + +static const u8 sText_TransmittingPleaseWait[] = _( + "Transmitiendo datos…\n" + "{COLOR 4}{SHADOW 5}No apagues (OFF) la consola\n" + "Game Boy Advance ni desconectes el\n" + "cable Game Link de Game Boy Advance."); + +static const u8 sText_PleaseFollowInstructionsOnScreen[] = _( + "Sigue las instrucciones que aparezcan\n" + "en la pantalla de la consola del\n" + "cartucho de Pokémon Rubí o Zafiro."); + +static const u8 sText_TransmissionFailureTryAgain[] = _( + "Error de transmisión.\n" + "{COLOR 4}{SHADOW 5}Inténtalo de nuevo."); + #else //ENGLISH static const u8 sText_BerryProgramUpdate[] = _("Berry Program Update"); static const u8 sText_RubySapphire[] = _("Ruby/Sapphire"); diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 09162511a0..c3edf0eee4 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -48,6 +48,15 @@ #define WIN_DESC_BASEBLOCK 170 #define WIN_BERRY_TAG_BASEBLOCK 278 #define BERRY_DESCRIPTION_X 5 +#elif SPANISH +#define WIN_BERRY_NAME_WIDTH 8 +#define WIN_BERRY_NAME_BASEBLOCK 72 +#define WIN_SIZE_FIRM_BASEBLOCK 88 +#define WIN_DESC_TILEMAP_LEFT 3 +#define WIN_DESC_WIDTH 27 +#define WIN_DESC_BASEBLOCK 160 +#define WIN_BERRY_TAG_BASEBLOCK 268 +#define BERRY_DESCRIPTION_X 5 #else //ENGLISH #define WIN_BERRY_NAME_WIDTH 8 #define WIN_BERRY_NAME_BASEBLOCK 69 @@ -432,7 +441,7 @@ static void PrintAllBerryData(void) static void PrintBerryNumberAndName(void) { -#if FRENCH +#if FRENCH || SPANISH const struct Berry *berry; ConvertIntToDecimalStringN(gStringVar1, sBerryTag->berryId, STR_CONV_MODE_LEADING_ZEROS, 2); berry = GetBerryInfo(sBerryTag->berryId);