more translations coming

15 files changed, 247 insertions, 230 deletions

diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 9347212e..f0cfe01e 100755
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -454,10 +454,10 @@ PrintNamingText:
 	ld a, [wNamingScreenType]
 	ld de, YourTextString
 	and a
-	jr z, .notNickname
+	jr z, .placeString
 	ld de, RivalsTextString
 	dec a
-	jr z, .notNickname
+	jr z, .placeString
 	ld a, [wcf91]
 	ld [wMonPartySpriteSpecies], a
 	push af
@@ -473,22 +473,18 @@ PrintNamingText:
 	hlcoord 1, 3
 	ld de, NicknameTextString
 	jr .placeString
-.notNickname
-	call PlaceString
-	ld l, c
-	ld h, b
-	ld de, NameTextString
+
 .placeString
 	jp PlaceString
 
 YourTextString:
-	db "YOUR @"
+	db "¿TU NOMBRE?@"
 
 RivalsTextString:
-	db "RIVAL's @"
+	db "¿NOMBRE RIVAL?@"
 
 NameTextString:
-	db "NAME?@"
+	db "¿NOMBRE?@"
 
 NicknameTextString:
-	db "NICKNAME?@"
+	db "¿APODO?@"
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index 28208ddc..5371ae76 100755
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -185,7 +185,7 @@ DisplayIntroNameTextBox:
 	jp HandleMenuInput
 
 .namestring
-	db "NAME@"
+	db "NOMBRE@"
 
 INCLUDE "data/player_names.asm"
 
diff --git a/text/BikeShop.asm b/text/BikeShop.asm
index 5d71133c..08118d68 100644
--- a/text/BikeShop.asm
+++ b/text/BikeShop.asm
@@ -1,71 +1,75 @@
 _BikeShopText_1d810::
-	text "Hi! Welcome to"
-	line "our BIKE SHOP."
+	text "¡Bienvenido a la"
+	line "TIENDA de BICIS!"
 
-	para "Have we got just"
-	line "the BIKE for you!"
+	para "¡Tenemos la BICI"
+	line "que buscabas!"
 	prompt
 
 _BikeShopText_1d815::
-	text "It's a cool BIKE!"
-	line "Do you want it?"
+	text "¡Esta BICICLETA"
+	line "es estupenda!"
+	cont "¿La quieres?"
 	done
 
 _BikeShopCantAffordText::
-	text "Sorry! You can't"
-	line "afford it!"
+	text "¡Lo siento! ¡No"
+	line "puedes pagarla!"
 	prompt
 
 _BikeShopText_1d81f::
-	text "Oh, that's..."
+	text "¡Oh! Eso es..."
 
-	para "A BIKE VOUCHER!"
+	para "¡Un BONO para"
+	line "una BICICLETA!"
 
-	para "OK! Here you go!"
+	para "¡Muy bien!"
+	line "¡Toda tuya!"
 	prompt
 
 _BikeShopText_1d824::
-	text "<PLAYER> exchanged"
-	line "the BIKE VOUCHER"
-	cont "for a BICYCLE.@"
+	text "<PLAYER> cambió"
+	line "el BONO por una"
+	cont "BICICLETA.@"
 	text_end
 
 _BikeShopComeAgainText::
-	text "Come back again"
-	line "some time!"
+	text "¡Vuelve cuando"
+	line "quieras!"
 	done
 
 _BikeShopText_1d82f::
-	text "How do you like"
-	line "your new BICYCLE?"
+	text "¿Te gusta tu"
+	line "nueva BICICLETA?"
 
-	para "You can take it"
-	line "on CYCLING ROAD"
-	cont "and in caves!"
+	para "¡Puedes usarla"
+	line "por el CAMINO de"
+	cont "las BICIS y por"
+	cont "las cuevas!"
 	done
 
 _BikeShopText_1d834::
-	text "You better make"
-	line "room for this!"
+	text "¡No tienes sitio"
+	line "para esto!"
 	done
 
 _BikeShopText_1d843::
-	text "A plain city BIKE"
-	line "is good enough"
-	cont "for me!"
+	text "¡Sólo necesito"
+	line "una BICICLETA"
+	cont "normal!"
 
-	para "You can't put a"
-	line "shopping basket"
-	cont "on an MTB!"
+	para "¡No puedes poner"
+	line "una cesta en una"
+	cont "MOTOCICLETA!"
 	done
 
 _BikeShopText_1d85c::
-	text "These BIKEs are"
-	line "cool, but they're"
-	cont "way expensive!"
+	text "¡Estas BICIS son"
+	line "geniales, pero"
+	cont "muy caras!"
 	done
 
 _BikeShopText_1d861::
-	text "Wow. Your BIKE is"
-	line "really cool!"
+	text "¡Uauu! ¡Vaya"
+	line "BICI tan chula!"
 	done
diff --git a/text/BillsHouse.asm b/text/BillsHouse.asm
index 11bb3200..e482eebe 100644
--- a/text/BillsHouse.asm
+++ b/text/BillsHouse.asm
@@ -1,88 +1,87 @@
 _BillsHouseText_1e865::
-	text "Hiya! I'm a"
-	line "#MON..."
-	cont "...No I'm not!"
+	text "¡Hola! Yo soy"
+	line "un #MON..."
+	cont "...¡No lo soy!"
 
-	para "Call me BILL!"
-	line "I'm a true blue"
-	cont "#MANIAC! Hey!"
-	cont "What's with that"
-	cont "skeptical look?"
+	para "¡Llámame BILL!"
+	line "¡Soy un auténtico"
+	cont "#MANÍACO!"
+	cont "¿Acaso no me"
+	cont "crees?"
 
-	para "I'm not joshing"
-	line "you, I screwed up"
-	cont "an experiment and"
-	cont "got combined with"
-	cont "a #MON!"
+	para "¡No bromeo!"
+	line "¡Arruiné un"
+	cont "experimento y me"
+	cont "mezclé con un"
+	cont "#MON!"
 
-	para "So, how about it?"
-	line "Help me out here!"
+	para "¿Qué me dices?"
+	line "¡Ayúdame a salir!"
 	done
 
 _BillsHouseText_1e86a::
-	text "When I'm in the"
-	line "TELEPORTER, go to"
-	cont "my PC and run the"
-	cont "Cell Separation"
-	cont "System!"
+	text "¡Cuando esté en"
+	line "el TELETRANSPORTE"
+	cont "vete a mi PC y"
+	cont "ejecuta la"
+	cont "Separación"
+	cont "Celular!"
 	done
 
 _BillsHouseText_1e86f::
-	text "No!? Come on, you"
-	line "gotta help a guy"
-	cont "in deep trouble!"
+	text "¿¡No!? ¡Debes"
+	line "ayudarme! ¡Tengo"
+	cont "graves problemas!"
 
-	para "What do you say,"
-	line "chief? Please?"
-	cont "OK? All right!"
+	para "¿Qué dices, jefe?"
+	line "¿Por favor? ¿OK?"
+	cont "¡Muy bien!"
 	prompt
 
 _BillThankYouText::
-	text "BILL: Yeehah!"
-	line "Thanks, bud! I"
-	cont "owe you one!"
+	text "BILL: ¡Yuuju!"
+	line "¡Gracias chaval!"
+	cont "¡Te debo una!"
 
-	para "So, did you come"
-	line "to see my #MON"
-	cont "collection?"
-	cont "You didn't?"
-	cont "That's a bummer."
+	para "Viniste a ver"
+	line "mi colección de"
+	cont "#MON, ¿no?"
+	cont "¡Bien hecho!"
 
-	para "I've got to thank"
-	line "you... Oh here,"
-	cont "maybe this'll do."
+	para "Te lo agradeceré"
+	line "... ¡Toma esto"
+	cont "como recompensa!"
 	prompt
 
 _SSTicketReceivedText::
-	text "<PLAYER> received"
-	line "an @"
+	text "¡<PLAYER> obtuvo"
+	line "@"
 	text_ram wcf4b
 	text "!@"
 	text_end
 
 _SSTicketNoRoomText::
-	text "You've got too"
-	line "much stuff, bud!"
+	text "Llevas demasiadas"
+	line "cosas, chico."
 	done
 
 _BillsHouseText_1e8cb::
-	text "That cruise ship,"
-	line "S.S.ANNE, is in"
-	cont "VERMILION CITY."
-	cont "Its passengers"
-	cont "are all trainers!"
+	text "Ese crucero, el"
+	line "S.S.ANNE, está en"
+	cont "la CIUDAD CARMÍN."
+	cont "¡Sus pasajeros"
+	cont "son entrenadores!"
 
-	para "They invited me"
-	line "to their party,"
-	cont "but I can't stand"
-	cont "fancy do's. Why"
-	cont "don't you go"
-	cont "instead of me?"
+	para "Me invitaron a su"
+	line "fiesta, pero yo"
+	cont "las odio. ¿Por"
+	cont "qué no vas tú"
+	cont "en mi lugar? " ; This space might be off
 	done
 
 _BillsHouseText_1e8da::
-	text "BILL: Look, bud,"
-	line "just check out"
-	cont "some of my rare"
-	cont "#MON on my PC!"
+	text "BILL: Mira, tengo"
+	line "algunos #MON"
+	cont "muy raros en"
+	cont "mi PC."
 	done
diff --git a/text/BluesHouse.asm b/text/BluesHouse.asm
index 6e57cb21..21e3e7a8 100644
--- a/text/BluesHouse.asm
+++ b/text/BluesHouse.asm
@@ -1,42 +1,44 @@
 _DaisyInitialText::
-	text "Hi <PLAYER>!"
-	line "<RIVAL> is out at"
-	cont "Grandpa's lab."
+	text "¡Hola <PLAYER>!"
+	line "¡<RIVAL> está"
+	cont "en el laboratorio"
+	cont "del abuelo!"
 	done
 
 _DaisyOfferMapText::
-	text "Grandpa asked you"
-	line "to run an errand?"
-	cont "Here, this will"
-	cont "help you!"
+	text "¿Te encargó algo"
+	line "el abuelo?"
+	cont "¡Toma esto!"
+	cont "¡Te ayudará!"
 	prompt
 
 _GotMapText::
-	text "<PLAYER> got a"
+	text "¡<PLAYER> obtuvo:"
 	line "@"
 	text_ram wcf4b
 	text "!@"
 	text_end
 
 _DaisyBagFullText::
-	text "You have too much"
-	line "stuff with you."
+	text "Llevas demasiadas"
+	line "cosas."
 	done
 
 _DaisyUseMapText::
-	text "Use the TOWN MAP"
-	line "to find out where"
-	cont "you are."
+	text "Usa el MAPA de"
+	line "PUEBLOS para"
+	cont "saber dónde"
+	cont "te encuentras."
 	done
 
 _BluesHouseDaisyWalkingText::
-	text "#MON are living"
-	line "things! If they"
-	cont "get tired, give"
-	cont "them a rest!"
+	text "¡Los #MON"
+	line "son seres vivos!"
+	cont "¡Si se cansan,"
+	cont "déjalos reposar!"
 	done
 
 _BluesHouseTownMapText::
-	text "It's a big map!"
-	line "This is useful!"
+	text "¡Es un gran mapa!"
+	line "¡Es muy útil!"
 	done
diff --git a/text/BrunosRoom.asm b/text/BrunosRoom.asm
index 9c493c4a..a4828439 100644
--- a/text/BrunosRoom.asm
+++ b/text/BrunosRoom.asm
@@ -1,37 +1,40 @@
 _BrunoBeforeBattleText::
-	text "I am BRUNO of"
-	line "the ELITE FOUR!"
+	text "¡Yo soy BRUNO"
+	line "del ALTO MANDO!"
 
-	para "Through rigorous"
-	line "training, people"
-	cont "and #MON can"
-	cont "become stronger!"
+	para "¡Con un riguroso"
+	line "entrenamiento,"
+	cont "la gente y los"
+	cont "#MON pueden"
+	cont "fortalecerse!"
 
-	para "I've weight"
-	line "trained with"
-	cont "my #MON!"
+	para "¡Yo he entrenado"
+	line "a mis #MON"
+	cont "con pesas!"
 
-	para "<PLAYER>!"
+	para "¡<PLAYER>!"
 
-	para "We will grind you"
-	line "down with our"
-	cont "superior power!"
+	para "¡Os machacaremos"
+	line "con nuestra"
+	cont "gran fuerza!"
 
-	para "Hoo hah!"
+	para "¡Ja ja ja!"
 	done
 
 _BrunoEndBattleText::
-	text "Why?"
-	line "How could I lose?"
+	text "¿Qué?"
+	line "¿Cómo he"
+	cont "podido perder?"
 	prompt
 
 _BrunoAfterBattleText::
-	text "My job is done!"
-	line "Go face your next"
-	cont "challenge!"
+	text "¡Yo ya he hecho"
+	line "mi trabajo! ¡Te"
+	cont "está esperando tu"
+	cont "próximo desafío!"
 	done
 
 _BrunoDontRunAwayText::
-	text "Someone's voice:"
-	line "Don't run away!"
+	text "Voz de alguien:"
+	line "¡No huyas!"
 	done
diff --git a/text/CeladonChiefHouse.asm b/text/CeladonChiefHouse.asm
index 19e59bd6..e6a12b8f 100644
--- a/text/CeladonChiefHouse.asm
+++ b/text/CeladonChiefHouse.asm
@@ -1,22 +1,24 @@
 _CeladonHouseText1::
-	text "Hehehe! The slots"
-	line "just reel in the"
-	cont "dough, big time!"
+	text "¡Jejeje! ¡He"
+	line "ganado una pasta!"
+	cont "¡Bravo!"
 	done
 
 _CeladonHouseText2::
-	text "CHIEF!"
+	text "¡JEFE!"
 
-	para "We just shipped"
-	line "2000 #MON as"
-	cont "slot prizes!"
+	para "¡2000 #MON"
+	line "fueron enviados"
+	cont "como premios"
+	cont "del casino!"
 	done
 
 _CeladonHouseText3::
-	text "Don't touch the"
-	line "poster at the"
-	cont "GAME CORNER!"
+	text "¡No toques el"
+	line "cartel del"
+	cont "CASINO!"
 
-	para "There's no secret"
-	line "switch behind it!"
+	para "¡No hay ningún"
+	line "botón secreto"
+	cont "detrás!"
 	done
diff --git a/text/CeladonHotel.asm b/text/CeladonHotel.asm
index f2eb059e..0ebf2a96 100644
--- a/text/CeladonHotel.asm
+++ b/text/CeladonHotel.asm
@@ -1,21 +1,22 @@
 _CeladonHotelText1::
-	text "#MON? No, this"
-	line "is a hotel for"
-	cont "people."
+	text "¿#MON?"
+	line "No, éste es un"
+	cont "hotel para gente."
 
-	para "We're full up."
+	para "¡Está completo!"
 	done
 
 _CeladonHotelText2::
-	text "I'm on vacation"
-	line "with my brother"
-	cont "and boy friend."
+	text "Estoy de"
+	line "vacaciones con mi"
+	cont "hermano y con "
+	cont "mi novio."
 
-	para "CELADON is such a"
-	line "pretty city!"
+	para "¡AZULONA es una"
+	line "bonita ciudad!"
 	done
 
 _CeladonHotelText3::
-	text "Why did she bring"
-	line "her brother?"
+	text "¿Por qué trajo"
+	line "a su hermano?"
 	done
diff --git a/text/CeladonMansion1F.asm b/text/CeladonMansion1F.asm
index 14a48a81..1ff2e81b 100644
--- a/text/CeladonMansion1F.asm
+++ b/text/CeladonMansion1F.asm
@@ -1,26 +1,29 @@
 _CeladonMansion1Text1::
-	text "MEOWTH: Meow!@"
+	text "MEOWTH: ¡Meow!@"
 	text_end
 
 _CeladonMansion1Text2::
-	text "My dear #MON"
-	line "keep me company."
+	text "¡Mis queridos"
+	line "#MON me"
+	cont "acompañan!"
 
-	para "MEOWTH even brings"
-	line "money home!"
+	para "¡Y MEOWTH hasta"
+	line "trae dinero"
+	cont "a casa!"
 	done
 
 _CeladonMansion1Text3::
-	text "CLEFAIRY: Pi"
-	line "pippippi!@"
+	text "CLEFAIRY: ¡Iry!"
+	line "¡Cleclecle!@"
 	text_end
 
 _CeladonMansion1Text4::
-	text "NIDORAN: Kya"
-	line "kyaoo!@"
+	text "NIDORAN: ¡Nidor!"
+	line "¡Nidoorr!@"
 	text_end
 
 _CeladonMansion1Text5::
-	text "CELADON MANSION"
-	line "Manager's Suite"
+	text "MANSIÓN AZULONA"
+	line "Suite"
+	cont "Presidencial"
 	done
diff --git a/text/CeladonMansion2F.asm b/text/CeladonMansion2F.asm
index b2ecb4fa..f63ee09b 100644
--- a/text/CeladonMansion2F.asm
+++ b/text/CeladonMansion2F.asm
@@ -1,4 +1,4 @@
 _CeladonMansion2Text1::
 	text "GAME FREAK"
-	line "Meeting Room"
+	line "Sala Desarrollo"
 	done
diff --git a/text/CeladonMansionRoof.asm b/text/CeladonMansionRoof.asm
index c8fd7ec8..dcb0cd0e 100644
--- a/text/CeladonMansionRoof.asm
+++ b/text/CeladonMansionRoof.asm
@@ -1,3 +1,3 @@
 _CeladonMansion4Text1::
-	text "I KNOW EVERYTHING!"
+	text "¡LO SÉ TODO!"
 	done
diff --git a/text/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm
index dab81a8d..53fadd85 100644
--- a/text/CeladonMansionRoofHouse.asm
+++ b/text/CeladonMansionRoofHouse.asm
@@ -1,10 +1,10 @@
 _CeladonMansion5Text1::
-	text "I know everything"
-	line "about the world"
-	cont "of #MON in"
-	cont "your GAME BOY!"
+	text "¡Yo lo sé todo"
+	line "sobre el mundo de"
+	cont "los #MON de"
+	cont "tu GAME BOY!"
 
-	para "Get together with"
-	line "your friends and"
-	cont "trade #MON!"
+	para "¡Reúnete con tus"
+	line "amigos y cambia"
+	cont "#MON!"
 	done
diff --git a/text/CeladonMart1F.asm b/text/CeladonMart1F.asm
index 8d805edc..ee24f6ae 100644
--- a/text/CeladonMart1F.asm
+++ b/text/CeladonMart1F.asm
@@ -1,31 +1,33 @@
 _CeladonMart1Text1::
-	text "Hello! Welcome to"
-	line "CELADON DEPT."
-	cont "STORE."
-
-	para "The board on the"
-	line "right describes"
-	cont "the store layout."
+	text "¡Hola! Bienvenido"
+	line "al CENTRO"
+	cont "COMERCIAL de la"
+	cont "CIUDAD AZULONA."
+
+	para "El tablero de la"
+	line "derecha es un"
+	cont "plano de las"
+	cont "tiendas."
 	done
 
 _CeladonMart1Text2::
-	text "1F: SERVICE"
-	line "    COUNTER"
+	text "PB: PUESTO DE"
+	line "INFORMACIÓN"
 
-	para "2F: TRAINER'S"
-	line "    MARKET"
+	para "P1: TIENDA DE"
+	line "ENTRENADORES"
 
-	para "3F: TV GAME SHOP"
+	para "P2: VIDEOJUEGOS"
 
-	para "4F: WISEMAN GIFTS"
+	para "P3: REGALOS"
 
-	para "5F: DRUG STORE"
+	para "P4: FARMACIA"
 
-	para "ROOFTOP SQUARE:"
-	line "VENDING MACHINES"
+	para "ÚLTIMO PISO:"
+	line "DISTRIBUIDORES"
 	done
 
 _CeladonMart1Text3::
-	text "1F: SERVICE"
-	line "    COUNTER"
+	text "PB: PUESTO DE"
+	line "INFORMACIÓN"
 	done
diff --git a/text/CeladonMart2F.asm b/text/CeladonMart2F.asm
index 74869902..706bac31 100644
--- a/text/CeladonMart2F.asm
+++ b/text/CeladonMart2F.asm
@@ -1,22 +1,24 @@
 _CeladonMart2Text3::
-	text "SUPER REPEL keeps"
-	line "weak #MON at"
-	cont "bay..."
+	text "El SÚPER REPEL"
+	line "mantiene a raya"
+	cont "a los #MON"
+	cont "débiles..."
 
-	para "Hmm, it's a more"
-	line "powerful REPEL!"
+	para "¡Es un REPELENTE"
+	line "más fuerte!"
 	done
 
 _CeladonMart2Text4::
-	text "For long outings,"
-	line "you should buy"
-	cont "REVIVE."
+	text "Para viajes"
+	line "largos deberías"
+	cont "comprar REVIVIR."
 	done
 
 _CeladonMart2Text5::
-	text "Top Grade Items"
-	line "for Trainers!"
+	text "Objetos de máxima"
+	line "calidad para los"
+	cont "entrenadores."
 
-	para "2F: TRAINER'S"
-	line "    MARKET"
+	para "P1: TIENDA DE LOS"
+	line "ENTRENADORES"
 	done
diff --git a/text/CeladonMart4F.asm b/text/CeladonMart4F.asm
index 78fa0b66..d43ed9c2 100644
--- a/text/CeladonMart4F.asm
+++ b/text/CeladonMart4F.asm
@@ -1,26 +1,29 @@
 _CeladonMart4Text2::
-	text "I'm getting a"
-	line "# DOLL for my"
-	cont "girl friend!"
+	text "¡Compraré una"
+	line "# MUÑECA"
+	cont "para mi novia!"
 	done
 
 _CeladonMart4Text3::
-	text "I heard something"
-	line "useful."
+	text "¡Me dijeron una"
+	line "cosa!"
 
-	para "You can run from"
-	line "wild #MON by"
-	cont "distracting them"
-	cont "with a # DOLL!"
+	para "¡Puedes huir de"
+	line "un #MON"
+	cont "salvaje si le"
+	cont "distraes con una"
+	cont "# MUÑECA!"
 	done
 
 _CeladonMart4Text4::
-	text "Express yourself"
-	line "with gifts!"
+	text "¡Dilo con un"
+	line "regalo!"
 
-	para "4F: WISEMAN GIFTS"
+	para "P3: REGALOS"
 
-	para "Evolution Special!"
-	line "Element STONEs on"
-	cont "sale now!"
+	para "¡Evolución"
+	line "Especial!"
+	cont "¡Diversas PIEDRAS"
+	cont "Elementales en"
+	cont "venta!"
 	done