more files translated

11 files changed, 484 insertions, 460 deletions

diff --git a/data/items/names.asm b/data/items/names.asm
index 0c07fe5d..0e75c3fc 100755
--- a/data/items/names.asm
+++ b/data/items/names.asm
@@ -1,98 +1,98 @@
 ItemNames::
 	db "MASTER BALL@"
 	db "ULTRA BALL@"
-	db "GREAT BALL@"
+	db "SÚPER BALL@"
 	db "POKé BALL@"
-	db "TOWN MAP@"
-	db "BICYCLE@"
+	db "MAPA PUEBLO@"
+	db "BICICLETA@"
 	db "?????@"
 	db "SAFARI BALL@"
 	db "POKéDEX@"
-	db "MOON STONE@"
-	db "ANTIDOTE@"
-	db "BURN HEAL@"
-	db "ICE HEAL@"
-	db "AWAKENING@"
-	db "PARLYZ HEAL@"
-	db "FULL RESTORE@"
-	db "MAX POTION@"
-	db "HYPER POTION@"
-	db "SUPER POTION@"
-	db "POTION@"
-	db "BOULDERBADGE@"
-	db "CASCADEBADGE@"
-	db "THUNDERBADGE@"
-	db "RAINBOWBADGE@"
-	db "SOULBADGE@"
-	db "MARSHBADGE@"
-	db "VOLCANOBADGE@"
-	db "EARTHBADGE@"
-	db "ESCAPE ROPE@"
-	db "REPEL@"
-	db "OLD AMBER@"
-	db "FIRE STONE@"
-	db "THUNDERSTONE@"
-	db "WATER STONE@"
-	db "HP UP@"
-	db "PROTEIN@"
-	db "IRON@"
-	db "CARBOS@"
-	db "CALCIUM@"
-	db "RARE CANDY@"
-	db "DOME FOSSIL@"
-	db "HELIX FOSSIL@"
-	db "SECRET KEY@"
+	db "PIEDRA LUNAR@"
+	db "ANTÍDOTO@"
+	db "ANTIQUEMAR@"
+	db "ANTIHIELO@"
+	db "DESPERTAR@"
+	db "ANTIPARALIZ.@"
+	db "RESTAU. TODO@"
+	db "MÁX. POCIÓN@"
+	db "HÍPER POCIÓN@"
+	db "SÚPER POCIÓN@"
+	db "POCIÓN@"
+	db "MED.ROCA@"
+	db "MED.CASCADA@"
+	db "MED.TRUENO@"
+	db "MED.ARCOIRIS@"
+	db "MED.ALMA@"
+	db "MED.PANTANO@"
+	db "MED.VOLCÁN@"
+	db "MED.TIERRA@"
+	db "CUERDA HUIDA@"
+	db "REPELENTE@"
+	db "ÁMBAR VIEJO@"
+	db "PIEDRA FUEGO@"
+	db "PIEDRATRUENO@"
+	db "PIEDRA AGUA@"
+	db "MÁS PS@"
+	db "PROTEÍNAS@"
+	db "HIERRO@"
+	db "CARBURANTE@"
+	db "CALCIO@"
+	db "CARAMELORARO@"
+	db "FÓSIL DOMO@"
+	db "FÓSIL HELIX@"
+	db "LL. SECRETA@"
 	db "?????@"
-	db "BIKE VOUCHER@"
-	db "X ACCURACY@"
-	db "LEAF STONE@"
-	db "CARD KEY@"
-	db "NUGGET@"
-	db "PP UP@"
-	db "POKé DOLL@"
-	db "FULL HEAL@"
-	db "REVIVE@"
-	db "MAX REVIVE@"
-	db "GUARD SPEC.@"
-	db "SUPER REPEL@"
-	db "MAX REPEL@"
-	db "DIRE HIT@"
-	db "COIN@"
-	db "FRESH WATER@"
-	db "SODA POP@"
-	db "LEMONADE@"
-	db "S.S.TICKET@"
-	db "GOLD TEETH@"
-	db "X ATTACK@"
-	db "X DEFEND@"
-	db "X SPEED@"
-	db "X SPECIAL@"
-	db "COIN CASE@"
-	db "OAK's PARCEL@"
-	db "ITEMFINDER@"
-	db "SILPH SCOPE@"
-	db "POKé FLUTE@"
-	db "LIFT KEY@"
-	db "EXP.ALL@"
-	db "OLD ROD@"
-	db "GOOD ROD@"
-	db "SUPER ROD@"
-	db "PP UP@"
-	db "ETHER@"
-	db "MAX ETHER@"
-	db "ELIXER@"
-	db "MAX ELIXER@"
-	db "B2F@"
-	db "B1F@"
-	db "1F@"
-	db "2F@"
-	db "3F@"
-	db "4F@"
-	db "5F@"
-	db "6F@"
-	db "7F@"
-	db "8F@"
-	db "9F@"
-	db "10F@"
-	db "11F@"
-	db "B4F@"
+	db "BONO BICI@"
+	db "PRECISIÓN X@"
+	db "PIEDRA HOJA@"
+	db "LL.MAGNÉTICA@"
+	db "PEPITA@"
+	db "MÁS  PP@"
+	db "POKé MUÑECA@"
+	db "CURA TOTAL@"
+	db "REVIVIR@"
+	db "MÁX. REVIVIR@"
+	db "PROTEC. ESP.@"
+	db "SÚPER REPEL@"
+	db "MÁX. REPEL@"
+	db "DIRECTO@"
+	db "MONEDA@"
+	db "AGUA FRESCA@"
+	db "REFRESCO@"
+	db "LIMONADA@"
+	db "TICKET BARCO@"
+	db "DIENTE ORO@"
+	db "ATAQUE X@"
+	db "DEFENSA X@"
+	db "VELOCIDAD X@"
+	db "ESPECIAL X@"
+	db "MONEDERO@"
+	db "CORREO-OAK@"
+	db "BUSCAOBJETOS@"
+	db "SCOPE SILPH@"
+	db "POKé FLAUTA@"
+	db "LL. ASCENSOR@"
+	db "REPARTIR EXP@"
+	db "CAñA VIEJA@"
+	db "CAñA BUENA@"
+	db "SÚPER CAÑA@"
+	db "MÁS  PP@"
+	db "ÉTER@"
+	db "ÉTER MÁX.@"
+	db "ELIXIR@"
+	db "ELIXIR MÁX.@"
+	db "S2@"
+	db "S1@"
+	db "PB@"
+	db "P1@"
+	db "P2@"
+	db "P3@"
+	db "P4@"
+	db "P5@"
+	db "P6@"
+	db "P7@"
+	db "P8@"
+	db "P9@"
+	db "P10@"
+	db "S4@"
diff --git a/data/moves/field_move_names.asm b/data/moves/field_move_names.asm
index b68ed828..22cd6f79 100644
--- a/data/moves/field_move_names.asm
+++ b/data/moves/field_move_names.asm
@@ -1,10 +1,10 @@
 FieldMoveNames:
-	db "CUT@"
-	db "FLY@"
+	db "CORTE@"
+	db "VUELO@"
 	db "@"
 	db "SURF@"
-	db "STRENGTH@"
-	db "FLASH@"
-	db "DIG@"
-	db "TELEPORT@"
-	db "SOFTBOILED@"
+	db "FUERZA@"
+	db "DESTELLO@"
+	db "EXCAVAR@"
+	db "TELETRANSP.@"
+	db "AMORTIGUADOR@"
diff --git a/data/moves/names.asm b/data/moves/names.asm
index cbb1a322..6e8e2285 100644
--- a/data/moves/names.asm
+++ b/data/moves/names.asm
@@ -1,166 +1,166 @@
 MoveNames::
-	db "POUND@"
-	db "KARATE CHOP@"
-	db "DOUBLESLAP@"
-	db "COMET PUNCH@"
-	db "MEGA PUNCH@"
-	db "PAY DAY@"
-	db "FIRE PUNCH@"
-	db "ICE PUNCH@"
-	db "THUNDERPUNCH@"
-	db "SCRATCH@"
-	db "VICEGRIP@"
-	db "GUILLOTINE@"
-	db "RAZOR WIND@"
-	db "SWORDS DANCE@"
-	db "CUT@"
-	db "GUST@"
-	db "WING ATTACK@"
-	db "WHIRLWIND@"
-	db "FLY@"
-	db "BIND@"
-	db "SLAM@"
-	db "VINE WHIP@"
-	db "STOMP@"
-	db "DOUBLE KICK@"
-	db "MEGA KICK@"
-	db "JUMP KICK@"
-	db "ROLLING KICK@"
-	db "SAND-ATTACK@"
-	db "HEADBUTT@"
-	db "HORN ATTACK@"
-	db "FURY ATTACK@"
-	db "HORN DRILL@"
-	db "TACKLE@"
-	db "BODY SLAM@"
-	db "WRAP@"
-	db "TAKE DOWN@"
-	db "THRASH@"
-	db "DOUBLE-EDGE@"
-	db "TAIL WHIP@"
-	db "POISON STING@"
-	db "TWINEEDLE@"
-	db "PIN MISSILE@"
-	db "LEER@"
-	db "BITE@"
-	db "GROWL@"
-	db "ROAR@"
-	db "SING@"
-	db "SUPERSONIC@"
-	db "SONICBOOM@"
-	db "DISABLE@"
-	db "ACID@"
-	db "EMBER@"
-	db "FLAMETHROWER@"
-	db "MIST@"
-	db "WATER GUN@"
-	db "HYDRO PUMP@"
+	db "DESTRUCTOR@"
+	db "GOLPE KARATE@"
+	db "DOBLEBOFETÓN@"
+	db "PUñO COMETA@"
+	db "MEGA PUñO@"
+	db "DíA DE PAGO@"
+	db "PUñO FUEGO@"
+	db "PUñO HIELO@"
+	db "PUñO-TRUENO@"
+	db "ARAñAZO@"
+	db "AGARRE@"
+	db "GUILLOTINA@"
+	db "V. CORTANTE@"
+	db "DANZA-ESPADA@"
+	db "CORTE@"
+	db "TORNADO@"
+	db "ATAQUE-ALA@"
+	db "REMOLINO@"
+	db "VUELO@"
+	db "ATADURA@"
+	db "PORTAZO@"
+	db "LÁTIGO CEPA@"
+	db "PISOTÓN@"
+	db "DOBLE PATADA@"
+	db "MEGA PATADA@"
+	db "PATADA SALTO@"
+	db "PATADA GIRO@"
+	db "ATAQUE-ARENA@"
+	db "GOLPE CABEZA@"
+	db "CORNADA@"
+	db "ATAQUE FURIA@"
+	db "PERFORADOR@"
+	db "PLACAJE@"
+	db "GOLPE CUERPO@"
+	db "REPETICIÓN@"
+	db "DERRIBO@"
+	db "GOLPE@"
+	db "DOBLE FILO@"
+	db "LÁTIGO@"
+	db "PICOTAZO VEN.@"
+	db "DOBLEATAQUE@"
+	db "PIN MISIL@"
+	db "MALICIOSO@"
+	db "MORDISCO@"
+	db "GRUñIDO@"
+	db "RUGIDO@"
+	db "CANTO@"
+	db "SUPERSÓNICO@"
+	db "BOMBA SÓNICA@"
+	db "ANULACIÓN@"
+	db "ÁCIDO@"
+	db "ASCUAS@"
+	db "LANZALLAMAS@"
+	db "NEBLINA@"
+	db "PISTOLA AGUA@"
+	db "HIDRO BOMBA@"
 	db "SURF@"
-	db "ICE BEAM@"
-	db "BLIZZARD@"
-	db "PSYBEAM@"
-	db "BUBBLEBEAM@"
-	db "AURORA BEAM@"
-	db "HYPER BEAM@"
-	db "PECK@"
-	db "DRILL PECK@"
-	db "SUBMISSION@"
-	db "LOW KICK@"
-	db "COUNTER@"
-	db "SEISMIC TOSS@"
-	db "STRENGTH@"
-	db "ABSORB@"
-	db "MEGA DRAIN@"
-	db "LEECH SEED@"
-	db "GROWTH@"
-	db "RAZOR LEAF@"
-	db "SOLARBEAM@"
-	db "POISONPOWDER@"
-	db "STUN SPORE@"
-	db "SLEEP POWDER@"
-	db "PETAL DANCE@"
-	db "STRING SHOT@"
-	db "DRAGON RAGE@"
-	db "FIRE SPIN@"
-	db "THUNDERSHOCK@"
-	db "THUNDERBOLT@"
-	db "THUNDER WAVE@"
-	db "THUNDER@"
-	db "ROCK THROW@"
-	db "EARTHQUAKE@"
-	db "FISSURE@"
-	db "DIG@"
-	db "TOXIC@"
-	db "CONFUSION@"
-	db "PSYCHIC@"
-	db "HYPNOSIS@"
-	db "MEDITATE@"
-	db "AGILITY@"
-	db "QUICK ATTACK@"
-	db "RAGE@"
-	db "TELEPORT@"
-	db "NIGHT SHADE@"
-	db "MIMIC@"
-	db "SCREECH@"
-	db "DOUBLE TEAM@"
-	db "RECOVER@"
-	db "HARDEN@"
-	db "MINIMIZE@"
-	db "SMOKESCREEN@"
-	db "CONFUSE RAY@"
-	db "WITHDRAW@"
-	db "DEFENSE CURL@"
-	db "BARRIER@"
-	db "LIGHT SCREEN@"
-	db "HAZE@"
-	db "REFLECT@"
-	db "FOCUS ENERGY@"
-	db "BIDE@"
-	db "METRONOME@"
-	db "MIRROR MOVE@"
-	db "SELFDESTRUCT@"
-	db "EGG BOMB@"
-	db "LICK@"
-	db "SMOG@"
-	db "SLUDGE@"
-	db "BONE CLUB@"
-	db "FIRE BLAST@"
-	db "WATERFALL@"
-	db "CLAMP@"
-	db "SWIFT@"
-	db "SKULL BASH@"
-	db "SPIKE CANNON@"
-	db "CONSTRICT@"
+	db "RAYO HIELO@"
+	db "VENTISCA@"
+	db "PSICO-RAYO@"
+	db "RAYO BURBUJA@"
+	db "RAYO AURORA@"
+	db "HÍPER RAYO@"
+	db "PICOTAZO@"
+	db "PICO TALADRO@"
+	db "SUMISIÓN@"
+	db "PATADA BAJA@"
+	db "CONTADOR@"
+	db "MOV. SÍSMICO@"
+	db "FUERZA@"
+	db "ABSORBER@"
+	db "MEGA AGOTAR@"
+	db "DRENADORAS@"
+	db "DESARROLLO@"
+	db "HOJA AFILADA@"
+	db "RAYO SOLAR@"
+	db "POLVO VENENO@"
+	db "PARALIZADOR@"
+	db "SOMNÍFERO@"
+	db "DANZA PÉTALO@"
+	db "DISP. DEMORA@"
+	db "FURIA DRAGÓN@"
+	db "GIRO FUEGO@"
+	db "IMPACTRUENO@"
+	db "RAYO@"
+	db "ONDA TRUENO@"
+	db "TRUENO@"
+	db "LANZA ROCAS@"
+	db "TERREMOTO@"
+	db "FISURA@"
+	db "EXCAVAR@"
+	db "TÓXICO@"
+	db "CONFUSIÓN@"
+	db "PSÍQUICO@"
+	db "HIPNOSIS@"
+	db "MEDITACIÓN@"
+	db "AGILIDAD@"
+	db "ATA. RÁPIDO@"
+	db "FURIA@"
+	db "TELETRANSP.@"
+	db "TINIEBLAS@"
+	db "MIMÉTICO@"
+	db "CHIRRIDO@"
+	db "DOBLE EQUIPO@"
+	db "RECUPERACIÓN@"
+	db "FORTALEZA@"
+	db "REDUCCIÓN@"
+	db "PANTALLAHUMO@"
+	db "RAYO CONFUSO@"
+	db "REFUGIO@"
+	db "RIZO DEFENSA@"
+	db "BARRERA@"
+	db "PANTALLA LUZ@"
+	db "NIEBLA@"
+	db "REFLEJO@"
+	db "FOCO ENERGÍA@"
+	db "VENGANZA@"
+	db "METRÓNOMO@"
+	db "MOV. ESPEJO@"
+	db "AUTODESTRUC.@"
+	db "BOMBA HUEVO@"
+	db "LENGÜETAZO@"
+	db "POLUCIÓN@"
+	db "RESIDUOS@"
+	db "HUESO PALO@"
+	db "LLAMARADA@"
+	db "CASCADA@"
+	db "TENAZA@"
+	db "RAPIDEZ@"
+	db "CABEZAZO@"
+	db "CLAVO CAñÓN@"
+	db "RESTRICCIÓN@"
 	db "AMNESIA@"
-	db "KINESIS@"
-	db "SOFTBOILED@"
-	db "HI JUMP KICK@"
-	db "GLARE@"
-	db "DREAM EATER@"
-	db "POISON GAS@"
-	db "BARRAGE@"
-	db "LEECH LIFE@"
-	db "LOVELY KISS@"
-	db "SKY ATTACK@"
-	db "TRANSFORM@"
-	db "BUBBLE@"
-	db "DIZZY PUNCH@"
-	db "SPORE@"
-	db "FLASH@"
-	db "PSYWAVE@"
-	db "SPLASH@"
-	db "ACID ARMOR@"
-	db "CRABHAMMER@"
-	db "EXPLOSION@"
-	db "FURY SWIPES@"
-	db "BONEMERANG@"
-	db "REST@"
-	db "ROCK SLIDE@"
-	db "HYPER FANG@"
-	db "SHARPEN@"
-	db "CONVERSION@"
-	db "TRI ATTACK@"
-	db "SUPER FANG@"
-	db "SLASH@"
-	db "SUBSTITUTE@"
-	db "STRUGGLE@"
+	db "KINÉTICO@"
+	db "AMORTIGUADOR@"
+	db "PATADA S.ALTA@"
+	db "DESLUMBRAR@"
+	db "COME SUEñOS@"
+	db "GAS VENENOSO@"
+	db "PRESA@"
+	db "CHUPA VIDAS@"
+	db "BESO AMOROSO@"
+	db "ATAQUE AÉREO@"
+	db "TRANSFORM.@"
+	db "BURBUJA@"
+	db "PUñO-MAREO@"
+	db "ESPORA@"
+	db "DESTELLO@"
+	db "PSICO-ONDA@"
+	db "SALPICADURA@"
+	db "ARMAD. ÁCIDA@"
+	db "MARTILLAZO@"
+	db "EXPLOSIÓN@"
+	db "GOLPES FURIA@"
+	db "HUESOMERANG@"
+	db "DESCANSO@"
+	db "AVALANCHA@"
+	db "HIP.COLMILLO@"
+	db "AFILAR@"
+	db "CONVERSIÓN@"
+	db "TRI-ATAQUE@"
+	db "SUPER DIENTE@"
+	db "CUCHILLADA@"
+	db "SUSTITUTO@"
+	db "COMBATE@"
diff --git a/data/player_names.asm b/data/player_names.asm
index f57c9877..51d9f32b 100644
--- a/data/player_names.asm
+++ b/data/player_names.asm
@@ -1,31 +1,31 @@
 IF DEF(_RED)
 DefaultNamesPlayer:
-	db   "NEW NAME"
-	next "RED"
+	db   "NUEVO N."
+	next "ROJO"
 	next "ASH"
-	next "JACK"
+	next "JAIME"
 	db   "@"
 
 DefaultNamesRival:
-	db   "NEW NAME"
-	next "BLUE"
+	db   "NUEVO N."
+	next "AZUL"
 	next "GARY"
-	next "JOHN"
+	next "JUAN"
 	db   "@"
 ENDC
 
 IF DEF(_BLUE)
 DefaultNamesPlayer:
-	db   "NEW NAME"
-	next "BLUE"
+	db   "NUEVO N."
+	next "AZUL"
 	next "GARY"
-	next "JOHN"
+	next "JUAN"
 	db   "@"
 
 DefaultNamesRival:
-	db   "NEW NAME"
-	next "RED"
+	db   "NUEVO N."
+	next "ROJO"
 	next "ASH"
-	next "JACK"
+	next "JAIME"
 	db   "@"
 ENDC
diff --git a/data/player_names_list.asm b/data/player_names_list.asm
index 56075df0..0fcb1b20 100644
--- a/data/player_names_list.asm
+++ b/data/player_names_list.asm
@@ -1,27 +1,27 @@
 IF DEF(_RED)
 DefaultNamesPlayerList:
-	db "NEW NAME@"
-	db "RED@"
+	db "NUEVO N.@"
+	db "ROJO@"
 	db "ASH@"
-	db "JACK@"
+	db "JAIME@"
 
 DefaultNamesRivalList:
-	db "NEW NAME@"
-	db "BLUE@"
+	db "NUEVO N.@"
+	db "AZUL@"
 	db "GARY@"
-	db "JOHN@"
+	db "JUAN@"
 ENDC
 
 IF DEF(_BLUE)
 DefaultNamesPlayerList:
-	db "NEW NAME@"
-	db "BLUE@"
+	db "NUEVO N.@"
+	db "AZUL@"
 	db "GARY@"
-	db "JOHN@"
+	db "JUAN@"
 
 DefaultNamesRivalList:
-	db "NEW NAME@"
-	db "RED@"
+	db "NUEVO N.@"
+	db "ROJO@"
 	db "ASH@"
-	db "JACK@"
+	db "JAIME@"
 ENDC
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index d1a69a61..74b44019 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -1205,87 +1205,93 @@ _HitXTimesText::
 	prompt
 
 _GainedText::
+	text "¡@"
 	text_ram wcd6d
-	text " gained"
+	text " ganó"
 	line "@"
 	text_end
 
 _WithExpAllText::
-	text "with EXP.ALL,"
+	text "con REPARTIR EXP,"
 	cont "@"
 	text_end
 
 _BoostedText::
-	text "a boosted"
+	text "un extra de"
 	cont "@"
 	text_end
 
 _ExpPointsText::
 	text_decimal wExpAmountGained, 2, 4
-	text " EXP. Points!"
+	text " Puntos EXP.!"
 	prompt
 
 _GrewLevelText::
+	text "¡@"
 	text_ram wcd6d
-	text " grew"
-	line "to level @"
+	text " subió"
+	line "al nivel @"
 	text_decimal wCurEnemyLVL, 1, 3
 	text "!@"
 	text_end
 
 _WildMonAppearedText::
-	text "Wild @"
+	text "¡Un @"
 	text_ram wEnemyMonNick
 	text_start
-	line "appeared!"
+	line "salvaje apareció!"
 	prompt
 
 _HookedMonAttackedText::
-	text "The hooked"
+	text "¡El malvado"
 	line "@"
 	text_ram wEnemyMonNick
 	text_start
-	cont "attacked!"
+	cont "atacó!"
 	prompt
 
 _EnemyAppearedText::
+	text "¡@"
 	text_ram wEnemyMonNick
 	text_start
-	line "appeared!"
+	line "apareció!"
 	prompt
 
 _TrainerWantsToFightText::
+	text "¡@"
 	text_ram wTrainerName
-	text " wants"
-	line "to fight!"
+	text_start
+	line "quiere luchar!"
 	prompt
 
 _UnveiledGhostText::
-	text "SILPH SCOPE"
-	line "unveiled the"
-	cont "GHOST's identity!"
+	text "¡El SCOPE SILPH"
+	line "reveló la"
+	cont "identidad"
+	cont "del GHOST!"
 	prompt
 
 _GhostCantBeIDdText::
-	text "Darn! The GHOST"
-	line "can't be ID'd!"
+	text "¡Maldición! ¡El"
+	line "GHOST no puede"
+	cont "ser identificado!"
 	prompt
 
 _GoText::
-	text "Go! @"
+	text "¡Ve @"
 	text_end
 
 _DoItText::
-	text "Do it! @"
+	text "¡Ataca @"
 	text_end
 
 _GetmText::
-	text "Get'm! @"
+	text "¡Ataca @"
 	text_end
 
 _EnemysWeakText::
-	text "The enemy's weak!"
-	line "Get'm! @"
+	text "¡Está débil!"
+	line "¡Ve @"
 	text_end
 
 _PlayerMon1Text::
@@ -1295,232 +1301,250 @@ _PlayerMon1Text::
 
 _PlayerMon2Text::
 	text_ram wBattleMonNick
-	text " @"
+	text ", @"
 	text_end
 
 _EnoughText::
-	text "enough!@"
+	text "¡Para!@"
 	text_end
 
 _OKExclamationText::
-	text "OK!@"
+	text "¡VALE!@"
 	text_end
 
 _GoodText::
-	text "good!@"
+	text "¡Bien!@"
 	text_end
 
 _ComeBackText::
 	text_start
-	line "Come back!"
-	done
+	line "¡Vuelve!@"
+	text_end
 
 _SuperEffectiveText::
-	text "It's super"
-	line "effective!"
+	text "¡Es súper"
+	line "efectivo!"
 	prompt
 
 _NotVeryEffectiveText::
-	text "It's not very"
-	line "effective..."
+	text "No es muy"
+	line "efectivo..."
 	prompt
 
 _SafariZoneEatingText::
-	text "Wild @"
+	text "¡El @"
 	text_ram wEnemyMonNick
 	text_start
-	line "is eating!"
+	line "salvaje está"
+	cont "comiendo!"
 	prompt
 
 _SafariZoneAngryText::
-	text "Wild @"
+	text "¡El @"
 	text_ram wEnemyMonNick
 	text_start
-	line "is angry!"
+	line "salvaje está"
+	cont "enfadado!"
 	prompt
 
 ; money related
 _PickUpPayDayMoneyText::
-	text "<PLAYER> picked up"
-	line "¥@"
+	text "¡<PLAYER> recogió"
+	line "@"
 	text_bcd wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
-	text "!"
+	text "¥!"
 	prompt
 
 _ClearSaveDataText::
-	text "Clear all saved"
-	line "data?"
+	text "¿Borrar todos los"
+	line "datos guardados?"
 	done
 
 _WhichFloorText::
-	text "Which floor do"
-	line "you want? "
+	text "¿A qué piso"
+	line "quieres ir?"
 	done
 
 _PartyMenuNormalText::
-	text "Choose a #MON."
+	text "Elige un #MON."
 	done
 
 _PartyMenuItemUseText::
-	text "Use item on which"
-	line "#MON?"
+	text "¿Usar objeto en"
+	line "qué #MON?"
 	done
 
 _PartyMenuBattleText::
-	text "Bring out which"
-	line "#MON?"
+	text "¿Qué #MON"
+	line "quieres utilizar?"
 	done
 
 _PartyMenuUseTMText::
-	text "Use TM on which"
-	line "#MON?"
+	text "¿Usar la MT/MO en"
+	line "qué #MON?"
 	done
 
 _PartyMenuSwapMonText::
-	text "Move #MON"
-	line "where?"
+	text "¿Mover #MON"
+	line "adónde?"
 	done
 
 _PotionText::
+	text "¡@"
 	text_ram wcd6d
 	text_start
-	line "recovered by @"
+	line "ha recuperado @"
 	text_decimal wHPBarHPDifference, 2, 3
 	text "!"
 	done
 
 _AntidoteText::
+	text "¡@"
 	text_ram wcd6d
-	text " was"
-	line "cured of poison!"
+	text " fue"
+	line "curado del veneno!"
 	done
 
 _ParlyzHealText::
+	text "¡@"
 	text_ram wcd6d
-	text "'s"
-	line "rid of paralysis!"
+	text_start
+	line "no está paraliz.!"
 	done
 
 _BurnHealText::
+	text "¡@"
 	text_ram wcd6d
-	text "'s"
-	line "burn was healed!"
+	text_start
+	line "fue curado!"
 	done
 
 _IceHealText::
+	text "¡@"
 	text_ram wcd6d
-	text " was"
-	line "defrosted!"
+	text_start
+	line "fue descongelado!"
 	done
 
 _AwakeningText::
+	text "¡@"	
 	text_ram wcd6d
 	text_start
-	line "woke up!"
+	line "se despertó!"
 	done
 
 _FullHealText::
+	text "¡@"
 	text_ram wcd6d
-	text "'s"
-	line "health returned!"
+	text_start
+	line "está recuperado!"
 	done
 
 _ReviveText::
+	text "¡@"
 	text_ram wcd6d
 	text_start
-	line "is revitalized!"
+	line "revitalizado!"
 	done
 
 _RareCandyText::
+	text "¡@"
 	text_ram wcd6d
-	text " grew"
-	line "to level @"
+	text " subió"
+	line "al nivel @"
 	text_decimal wCurEnemyLVL, 1, 3
 	text "!@"
 	text_end
 
 _TurnedOnPC1Text::
-	text "<PLAYER> turned on"
-	line "the PC."
+	text "<PLAYER> encendió"
+	line "el PC."
 	prompt
 
 _AccessedBillsPCText::
-	text "Accessed BILL's"
-	line "PC."
+	text "Accedes al"
+	line "PC de BILL."
 
-	para "Accessed #MON"
-	line "Storage System."
+	para "Accedes al"
+	line "Sistema de"
+	cont "Almacenamiento"
+	cont "de los #MON."
 	prompt
 
 _AccessedSomeonesPCText::
-	text "Accessed someone's"
-	line "PC."
+	text "Accedes al PC"
+	line "de Alguien."
 
-	para "Accessed #MON"
-	line "Storage System."
+	para "Accedes al"
+	line "Sistema de"
+	cont "Almacenamiento"
+	cont "de los #MON."
 	prompt
 
 _AccessedMyPCText::
-	text "Accessed my PC."
+	text "Accedes a tu PC."
 
-	para "Accessed Item"
-	line "Storage System."
+	para "Accedes al"
+	line "Sistema de"
+	cont "Almacenamiento"
+	cont "de Objetos."
 	prompt
 
 _TurnedOnPC2Text::
-	text "<PLAYER> turned on"
-	line "the PC."
+	text "<PLAYER> encendió"
+	line "el PC."
 	prompt
 
 _WhatDoYouWantText::
-	text "What do you want"
-	line "to do?"
+	text "¿Qué quieres"
+	line "hacer?"
 	done
 
 _WhatToDepositText::
-	text "What do you want"
-	line "to deposit?"
+	text "¿Qué quieres"
+	line "guardar?"
 	done
 
 _DepositHowManyText::
-	text "How many?"
+	text "¿Cuántos?"
 	done
 
 _ItemWasStoredText::
 	text_ram wcd6d
-	text " was"
-	line "stored via PC."
+	text " fue"
+	line "guardado vía PC."
 	prompt
 
 _NothingToDepositText::
-	text "You have nothing"
-	line "to deposit."
+	text "No tienes nada"
+	line "para dejar."
 	prompt
 
 _NoRoomToStoreText::
-	text "No room left to"
-	line "store items."
+	text "No tienes sitio"
+	line "donde guardar"
+	cont "los objetos."
 	prompt
 
 _WhatToWithdrawText::
-	text "What do you want"
-	line "to withdraw?"
+	text "¿Qué quieres"
+	line "retirar?"
 	done
 
 _WithdrawHowManyText::
-	text "How many?"
+	text "¿Cuántos?"
 	done
 
 _WithdrewItemText::
-	text "Withdrew"
+	text "Retirado:"
 	line "@"
 	text_ram wcd6d
 	text "."
 	prompt
 
 _NothingStoredText::
-	text "There is nothing"
-	line "stored."
+	text "No hay nada"
+	line "almacenado."
 	prompt
 
 _CantCarryMoreText::
@@ -1790,7 +1814,7 @@ _WillBeTradedText::
 	text " y"
 	line "@"
 	text_ram wcd6d
-	text ""
+	text_start
 	cont "serán cambiados."
 	done
 
diff --git a/data/text_boxes.asm b/data/text_boxes.asm
index 34e6a414..de74e308 100644
--- a/data/text_boxes.asm
+++ b/data/text_boxes.asm
@@ -37,15 +37,15 @@ TextBoxTextAndCoordTable:
 	text_box_text JP_POKEDEX_MENU_TEMPLATE,          11,  8, 19, 17, JapanesePokedexMenu,     12, 10
 
 BuySellQuitText:
-	db   "BUY"
-	next "SELL"
-	next "QUIT@"
+	db   "COMPRAR"
+	next "VENDER"
+	next "¡ADIÓS!@"
 
 	db "@" ; unused
 
 UseTossText:
-	db   "USE"
-	next "TOSS@"
+	db   "USAR"
+	next "TIRAR@"
 
 JapaneseSaveMessageText:
 	db   "きろく"
@@ -56,7 +56,7 @@ JapaneseSpeedOptionsText:
 	next "おそい@"
 
 MoneyText:
-	db "MONEY@"
+	db "DIN.@"
 
 JapaneseMochimonoText:
 	db "もちもの@"
@@ -66,17 +66,17 @@ JapaneseMainMenuText:
 	next "さいしょから@"
 
 BattleMenuText:
-	db   "FIGHT <PK><MN>"
-	next "ITEM  RUN@"
+	db   "LUCHA <PK><MN>"
+	next "OBJ.  ESC@"
 
 SafariZoneBattleMenuText:
-	db   "BALL×       BAIT"
-	next "THROW ROCK  RUN@"
+	db   "BALL×       CEBO"
+	next "LANZA ROCA  CORRE@"
 
 SwitchStatsCancelText:
-	db   "SWITCH"
-	next "STATS"
-	next "CANCEL@"
+	db   "CAMBIO"
+	next "ESTAD."
+	next "SALIR@"
 
 JapaneseAhText:
 	db "アッ！@"
diff --git a/data/trainers/names.asm b/data/trainers/names.asm
index d8e1f550..9a89e5ed 100755
--- a/data/trainers/names.asm
+++ b/data/trainers/names.asm
@@ -1,36 +1,36 @@
 TrainerNames::
-	db "YOUNGSTER@"
-	db "BUG CATCHER@"
-	db "LASS@"
-	db "SAILOR@"
-	db "JR.TRAINER♂@"
-	db "JR.TRAINER♀@"
-	db "POKéMANIAC@"
-	db "SUPER NERD@"
-	db "HIKER@"
-	db "BIKER@"
-	db "BURGLAR@"
-	db "ENGINEER@"
-	db "JUGGLER@"
-	db "FISHERMAN@"
-	db "SWIMMER@"
-	db "CUE BALL@"
-	db "GAMBLER@"
-	db "BEAUTY@"
-	db "PSYCHIC@"
-	db "ROCKER@"
-	db "JUGGLER@"
-	db "TAMER@"
-	db "BIRD KEEPER@"
-	db "BLACKBELT@"
+	db "JOVEN@"
+	db "CAZABICHOS@"
+	db "CHICA@"
+	db "MARINERO@"
+	db "ENTRENAD.JR♂@"
+	db "ENTRENAD.JR♀@"
+	db "POKéMANÍACO@"
+	db "SÚPER NECIO@"
+	db "MONTAÑERO@"
+	db "MOTORISTA@"
+	db "LADRÓN@"
+	db "MECÁNICO@"
+	db "MALABARISTA@"
+	db "PESCADOR@"
+	db "NADADOR@"
+	db "CALVO@"
+	db "JUGADOR@"
+	db "BELLA@"
+	db "MÉDIUM@"
+	db "ROCKERO@"
+	db "MALABARISTA@"
+	db "DOMADOR@"
+	db "ORNITÓLOGO@"
+	db "KARATEKA@"
 	db "RIVAL1@"
 	db "PROF.OAK@"
 	db "CHIEF@"
-	db "SCIENTIST@"
+	db "CIENTÍFICO@"
 	db "GIOVANNI@"
 	db "ROCKET@"
-	db "COOLTRAINER♂@"
-	db "COOLTRAINER♀@"
+	db "ENTREN.GUAY♂@"
+	db "ENTREN.GUAY♀@"
 	db "BRUNO@"
 	db "BROCK@"
 	db "MISTY@"
@@ -39,10 +39,10 @@ TrainerNames::
 	db "KOGA@"
 	db "BLAINE@"
 	db "SABRINA@"
-	db "GENTLEMAN@"
+	db "CABALLERO@"
+	db "RIVAL2@"
 	db "RIVAL2@"
-	db "RIVAL3@"
 	db "LORELEI@"
-	db "CHANNELER@"
+	db "EXORCISTA@"
 	db "AGATHA@"
 	db "LANCE@"
diff --git a/data/types/names.asm b/data/types/names.asm
index b1c35f65..cc2eb89b 100755
--- a/data/types/names.asm
+++ b/data/types/names.asm
@@ -23,18 +23,18 @@ ENDR
 	dw .Dragon
 
 .Normal:   db "NORMAL@"
-.Fighting: db "FIGHTING@"
-.Flying:   db "FLYING@"
-.Poison:   db "POISON@"
-.Fire:     db "FIRE@"
-.Water:    db "WATER@"
-.Grass:    db "GRASS@"
-.Electric: db "ELECTRIC@"
-.Psychic:  db "PSYCHIC@"
-.Ice:      db "ICE@"
-.Ground:   db "GROUND@"
-.Rock:     db "ROCK@"
-.Bird:     db "BIRD@"
-.Bug:      db "BUG@"
-.Ghost:    db "GHOST@"
-.Dragon:   db "DRAGON@"
+.Fighting: db "LUCHA@"
+.Flying:   db "VOLADOR@"
+.Poison:   db "VENENO@"
+.Fire:     db "FUEGO@"
+.Water:    db "AGUA@"
+.Grass:    db "PLANTA@"
+.Electric: db "ELÉCTRIC@"
+.Psychic:  db "PSÍQUICO@"
+.Ice:      db "HIELO@"
+.Ground:   db "TIERRA@"
+.Rock:     db "ROCA@"
+.Bird:     db "PÁJARO@"
+.Bug:      db "BICHO@"
+.Ghost:    db "FANTASMA@"
+.Dragon:   db "DRAGÓN@"
diff --git a/data/yes_no_menu_strings.asm b/data/yes_no_menu_strings.asm
index db2eeb4c..1a7fdaca 100644
--- a/data/yes_no_menu_strings.asm
+++ b/data/yes_no_menu_strings.asm
@@ -15,14 +15,6 @@ TwoOptionMenuStrings:
 	two_option_menu 7, 4, TRUE,  .HealCancelMenu
 	two_option_menu 4, 3, FALSE, .NoYesMenu
 
-.NoYesMenu:
-	db   "NO"
-	next "YES@"
-
-.YesNoMenu:
-	db   "YES"
-	next "NO@"
-
 .NorthWestMenu:
 	db   "NORTH"
 	next "WEST@"
@@ -35,10 +27,18 @@ TwoOptionMenuStrings:
 	db   "NORTH"
 	next "EAST@"
 
+.NoYesMenu:
+	db   "NO"
+	next "SÍ@"
+
+.YesNoMenu:
+	db   "SÍ"
+	next "NO@"
+
 .TradeCancelMenu:
-	db   "TRADE"
-	next "CANCEL@"
+	db   "TRATO"
+	next "SALIR@"
 
 .HealCancelMenu:
-	db   "HEAL"
-	next "CANCEL@"
+	db   "CURAR"
+	next "SALIR@"
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index d4164332..558d90d4 100755
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1426,11 +1426,11 @@ VitaminNoEffectText:
 	text_end
 
 VitaminText:
-	db "HEALTH@"
-	db "ATTACK@"
-	db "DEFENSE@"
-	db "SPEED@"
-	db "SPECIAL@"
+	db "SALUD@"
+	db "ATAQUE@"
+	db "DEFENSA@"
+	db "VELOCID.@"
+	db "ESPECIAL@"
 
 ItemUseBait:
 	ld hl, ThrewBaitText