21 files changed, 111 insertions, 89 deletions
diff --git a/data/text_boxes.asm b/data/text_boxes.asm
index de74e308..16dc91d1 100644
--- a/data/text_boxes.asm
+++ b/data/text_boxes.asm
@@ -24,47 +24,32 @@ ENDM
 
 TextBoxTextAndCoordTable:
 	; text box ID, upper-left X, upper-left Y, lower-right X, lower-right Y, text pointer, text X, text Y
-	text_box_text JP_MOCHIMONO_MENU_TEMPLATE,         0,  0, 14, 17, JapaneseMochimonoText,    3,  0
+	text_box_text JP_MOCHIMONO_MENU_TEMPLATE,         0,  0, 14, 17, BuySellQuitText,          3,  0
 	text_box_text USE_TOSS_MENU_TEMPLATE,            13, 10, 19, 14, UseTossText,             15, 11
-	text_box_text JP_SAVE_MESSAGE_MENU_TEMPLATE,      0,  0,  7,  5, JapaneseSaveMessageText,  2,  2
-	text_box_text JP_SPEED_OPTIONS_MENU_TEMPLATE,     0,  6,  5, 10, JapaneseSpeedOptionsText, 2,  7
+	text_box_text JP_SAVE_MESSAGE_MENU_TEMPLATE,      0,  0,  7,  5, BuySellQuitText,          2,  2
+	text_box_text JP_SPEED_OPTIONS_MENU_TEMPLATE,     0,  6,  5, 10, BuySellQuitText,          2,  7
 	text_box_text BATTLE_MENU_TEMPLATE,               8, 12, 19, 17, BattleMenuText,          10, 14
 	text_box_text SAFARI_BATTLE_MENU_TEMPLATE,        0, 12, 19, 17, SafariZoneBattleMenuText, 2, 14
 	text_box_text SWITCH_STATS_CANCEL_MENU_TEMPLATE, 11, 11, 19, 17, SwitchStatsCancelText,   13, 12
 	text_box_text BUY_SELL_QUIT_MENU_TEMPLATE,        0,  0, 10,  6, BuySellQuitText,          2,  1
 	text_box_text MONEY_BOX_TEMPLATE,                11,  0, 19,  2, MoneyText,               13,  0
-	text_box_text JP_AH_MENU_TEMPLATE,                7,  6, 11, 10, JapaneseAhText,           8,  8
-	text_box_text JP_POKEDEX_MENU_TEMPLATE,          11,  8, 19, 17, JapanesePokedexMenu,     12, 10
+	text_box_text JP_AH_MENU_TEMPLATE,                7,  6, 11, 10, BuySellQuitText,          8,  8
+	text_box_text JP_POKEDEX_MENU_TEMPLATE,          11,  8, 19, 17, BuySellQuitText,         12, 10
 
 BuySellQuitText:
 	db   "COMPRAR"
 	next "VENDER"
 	next "¡ADIÓS!@"
 
-	db "@" ; unused
+	;db "@" ; unused
 
 UseTossText:
 	db   "USAR"
 	next "TIRAR@"
 
-JapaneseSaveMessageText:
-	db   "きろく"
-	next "メッセージ@"
-
-JapaneseSpeedOptionsText:
-	db   "はやい"
-	next "おそい@"
-
 MoneyText:
 	db "DIN.@"
 
-JapaneseMochimonoText:
-	db "もちもの@"
-
-JapaneseMainMenuText:
-	db   "つづきから"
-	next "さいしょから@"
-
 BattleMenuText:
 	db   "LUCHA <PK><MN>"
 	next "OBJ.  ESC@"
@@ -77,12 +62,3 @@ SwitchStatsCancelText:
 	db   "CAMBIO"
 	next "ESTAD."
 	next "SALIR@"
-
-JapaneseAhText:
-	db "アッ！@"
-
-JapanesePokedexMenu:
-	db   "データをみる"
-	next "なきごえ"
-	next "ぶんぷをみる"
-	next "キャンセル@"
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm
index bd4a1901..ab556aca 100755
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -75,13 +75,13 @@ EndOfBattle:
 	ret
 
 YouWinText:
-	db "YOU WIN@"
+	db "  GANAS@"
 
 YouLoseText:
-	db "YOU LOSE@"
+	db "PIERDES@"
 
 DrawText:
-	db "  DRAW@"
+	db "EMPATE@"
 
 PickUpPayDayMoneyText:
 	text_far _PickUpPayDayMoneyText
diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm
index 29c11356..9d65b805 100644
--- a/engine/battle/link_battle_versus_text.asm
+++ b/engine/battle/link_battle_versus_text.asm
@@ -13,9 +13,9 @@ DisplayLinkBattleVersusTextBox:
 	call PlaceString
 ; place bold "VS" tiles between the names
 	hlcoord 9, 8
-	ld a, $69
+	ld a, "V"
 	ld [hli], a
-	ld [hl], $6a
+	ld [hl], "S"
 	xor a
 	ld [wUpdateSpritesEnabled], a
 	callfar SetupPlayerAndEnemyPokeballs
diff --git a/engine/events/evolve_trade.asm b/engine/events/evolve_trade.asm
index 56069fac..409925c1 100755
--- a/engine/events/evolve_trade.asm
+++ b/engine/events/evolve_trade.asm
@@ -17,18 +17,18 @@ EvolveTradeMon:
 
 ; This was fixed in Yellow.
 
-	ld a, [wInGameTradeReceiveMonName]
+	;ld a, [wInGameTradeReceiveMonName]
 
 	; GRAVELER
-	cp "G"
-	jr z, .ok
+	;cp "G"
+	;jr z, .ok
 
 	; "SPECTRE" (HAUNTER)
-	cp "S"
-	ret nz
-	ld a, [wInGameTradeReceiveMonName + 1]
-	cp "P"
-	ret nz
+	;cp "S"
+	;ret nz
+	;ld a, [wInGameTradeReceiveMonName + 1]
+	;cp "P"
+	ret
 
 .ok
 	ld a, [wPartyCount]
diff --git a/engine/events/hidden_objects/bills_house_pc.asm b/engine/events/hidden_objects/bills_house_pc.asm
index a73596b4..3990de6a 100644
--- a/engine/events/hidden_objects/bills_house_pc.asm
+++ b/engine/events/hidden_objects/bills_house_pc.asm
@@ -127,7 +127,7 @@ BillsMonListText:
 	next "FLAREON"
 	next "JOLTEON"
 	next "VAPOREON"
-	next "CANCEL@"
+	next "SALIR@"
 
 BillsHousePokemonListText2:
 	text_far _BillsHousePokemonListText2
diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm
index a67f1c07..37460c5b 100755
--- a/engine/events/vending_machine.asm
+++ b/engine/events/vending_machine.asm
@@ -85,15 +85,15 @@ VendingMachineText1:
 	text_end
 
 DrinkText:
-	db   "FRESH WATER"
-	next "SODA POP"
-	next "LEMONADE"
-	next "CANCEL@"
+	db   "AGUA FRESCA"
+	next "REFRESCO"
+	next "LIMONADA"
+	next "SALIR@"
 
 DrinkPriceText:
-	db   "¥200"
-	next "¥300"
-	next "¥350"
+	db   "200¥"
+	next "300¥"
+	next "350¥"
 	next "@"
 
 VendingMachineText4:
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 558d90d4..fb0bc847 100755
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -826,8 +826,8 @@ ItemUseMedicine:
 	ld [wActionResultOrTookBattleTurn], a ; item use failed
 	jp PrintText
 .emptyPartyText
-	text "You don't have"
-	line "any #MON!"
+	text "No tienes ningún"
+	line "#MON."
 	prompt
 .notUsingSoftboiled
 	call DisplayPartyMenu
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm
index 71afde1e..46a2bf77 100755
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@@ -290,7 +290,7 @@ CableClub_DoBattleOrTradeAgain:
 	jr CallCurrentTradeCenterFunction
 
 PleaseWaitString:
-	db "PLEASE WAIT!@"
+	db "¡ESPERA!@"
 
 CallCurrentTradeCenterFunction:
 	ld hl, TradeCenterPointerTable
@@ -533,7 +533,7 @@ TradeCenter_SelectMon:
 	ld [wTradeCenterPointerTableIndex], a
 	jp CallCurrentTradeCenterFunction
 .statsTrade
-	db "STATS     TRADE@"
+	db "ESTAD.    TRATO@"
 .selectedCancelMenuItem
 	ld a, [wCurrentMenuItem]
 	ld b, a
@@ -609,7 +609,7 @@ TradeCenter_DrawCancelBox:
 	jp PlaceString
 
 CancelTextString:
-	db "CANCEL@"
+	db "Trato Cancelado@"
 
 TradeCenter_PlaceSelectedEnemyMonMenuCursor:
 	ld a, [wSerialSyncAndExchangeNybbleReceiveData]
@@ -876,11 +876,11 @@ WillBeTradedText:
 	text_end
 
 TradeCompleted:
-	db "Trade completed!@"
+	db "Trato Completado@"
 
 TradeCanceled:
-	db   "Too bad! The trade"
-	next "was canceled!@"
+	db   "¡Mal! ¡El trato"
+	next "está cancelado!@"
 
 TradeCenterPointerTable:
 	dw TradeCenter_SelectMon
diff --git a/engine/link/print_waiting_text.asm b/engine/link/print_waiting_text.asm
index 1a16e2f2..c03f0bd6 100644
--- a/engine/link/print_waiting_text.asm
+++ b/engine/link/print_waiting_text.asm
@@ -18,4 +18,4 @@ PrintWaitingText::
 	jp DelayFrames
 
 WaitingText:
-	db "Waiting...!@"
+	db "¡ESPERA...!@"
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index d40b73d7..181978fc 100755
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -324,12 +324,15 @@ DisplayNamingScreen:
 	jp EraseMenuCursor
 
 LoadEDTile:
-	ld de, ED_Tile
-	ld hl, vFont tile $70
-	ld bc, (ED_TileEnd - ED_Tile) / $8
+	call DisableLCD
+	ld de, vFont + $700
+	ld hl, ED_Tile
+	ld bc, (ED_TileEnd - ED_Tile)
 	; to fix the graphical bug on poor emulators
-	;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8
-	jp CopyVideoDataDouble
+	;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile)
+	ld a, $01
+	call FarCopyDataDouble
+	jp EnableLCD
 
 ED_Tile:
 	INCBIN "gfx/font/ED.1bpp"
diff --git a/engine/menus/players_pc.asm b/engine/menus/players_pc.asm
index 75c0b335..e896cfae 100755
--- a/engine/menus/players_pc.asm
+++ b/engine/menus/players_pc.asm
@@ -1,6 +1,4 @@
 PlayerPC::
-	ld hl, wd730
-	set 6, [hl]
 	ld a, ITEM_NAME
 	ld [wNameListType], a
 	call SaveScreenTilesToBuffer1
@@ -17,6 +15,8 @@ PlayerPC::
 	call PrintText
 
 PlayerPCMenu:
+	ld hl, wd730
+	set 6, [hl]
 	ld a, [wParentMenuItem]
 	ld [wCurrentMenuItem], a
 	ld hl, wFlags_0xcd60
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index 6a98a10c..ac3b218f 100755
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -552,8 +552,9 @@ DrawTrainerInfo:
 	call PlaceString
 	hlcoord 8, 4
 	ld de, wPlayerMoney
-	ld c, $e3
+	ld c, $c3
 	call PrintBCDNumber
+	ld [hl], $f0
 	hlcoord 9, 6
 	ld de, wPlayTimeHours ; hours
 	lb bc, LEFT_ALIGN | 1, 3
@@ -569,13 +570,13 @@ TrainerInfo_FarCopyData:
 	jp FarCopyData2
 
 TrainerInfo_NameMoneyTimeText:
-	db   "NAME/"
-	next "MONEY/"
-	next "TIME/@"
+	db   "NOM./"
+	next "DIN./"
+	next "TIEMPO/@"
 
 ; $76 is a circle tile
 TrainerInfo_BadgesText:
-	db $76,"BADGES",$76,"@"
+	db $76,"MEDALLAS",$76,"@"
 
 ; draws a text box on the trainer info screen
 ; height is always 6
diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm
index f61db9ae..6579e656 100644
--- a/engine/menus/text_box.asm
+++ b/engine/menus/text_box.asm
@@ -138,8 +138,11 @@ DisplayMoneyBox:
 	ld c, 6
 	call ClearScreenArea
 	hlcoord 12, 1
+	ld de, CurrencyString
+	call PlaceString
+	hlcoord 12, 1
 	ld de, wPlayerMoney
-	ld c, $a3
+	ld c, "D"
 	call PrintBCDNumber
 	ld hl, wd730
 	res 6, [hl]
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 2fb8c384..5dcef8ec 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -448,6 +448,7 @@ InitializeSpriteStatus:
 	ld a, $8
 	ld [hli], a   ; [x#SPRITESTATEDATA2_YDISPLACEMENT] = 8
 	ld [hl], a    ; [x#SPRITESTATEDATA2_XDISPLACEMENT] = 8
+	call InitializeSpriteScreenPosition ; could have done fallthrough here
 	ret
 
 ; calculates the sprite's screen position from its map position and the player position
@@ -460,7 +461,7 @@ InitializeSpriteScreenPosition:
 	ld b, a
 	ld a, [hl]      ; x#SPRITESTATEDATA2_MAPY
 	sub b           ; relative to player position
-	swap a          ; * 16
+	call Func_515D
 	sub $4          ; - 4
 	dec h
 	ld [hli], a     ; [x#SPRITESTATEDATA1_YPIXELS]
@@ -469,11 +470,23 @@ InitializeSpriteScreenPosition:
 	ld b, a
 	ld a, [hli]     ; x#SPRITESTATEDATA2_MAPX
 	sub b           ; relative to player position
-	swap a          ; * 16
+	call Func_515D
 	dec h
 	ld [hl], a      ; [x#SPRITESTATEDATA1_XPIXELS]
 	ret
 
+Func_515D:
+	jr nc, .asm_5166
+	cpl
+	inc a
+	swap a
+	cpl
+	inc a
+	ret
+.asm_5166
+	swap a
+	ret
+
 ; tests if sprite is off screen or otherwise unable to do anything
 CheckSpriteAvailability:
 	predef IsObjectHidden
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 5a5dd845..1b3ef45b 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -39,11 +39,11 @@ DisplayPCMainMenu::
 .next2
 	call PlaceString
 	hlcoord 2, 4
-	ld de, wPlayerName
+	ld de, PlayersPCText
 	call PlaceString
 	ld l, c
 	ld h, b
-	ld de, PlayersPCText
+	ld de, wPlayerName
 	call PlaceString
 	CheckEvent EVENT_GOT_POKEDEX
 	jr z, .noOaksPC2
@@ -85,12 +85,12 @@ DisplayPCMainMenu::
 	ldh [hAutoBGTransferEnabled], a
 	ret
 
-SomeonesPCText:   db "SOMEONE's PC@"
-BillsPCText:      db "BILL's PC@"
-PlayersPCText:    db "'s PC@"
-OaksPCText:       db "PROF.OAK's PC@"
-PKMNLeaguePCText: db "<PKMN>LEAGUE@"
-LogOffPCText:     db "LOG OFF@"
+SomeonesPCText:   db "PC DE ALGUIEN@"
+BillsPCText:      db "PC DE BILL@"
+PlayersPCText:    db "PC DE @"
+OaksPCText:       db "PC PROF. OAK@"
+PKMNLeaguePCText: db "LIGA <PKMN>@"
+LogOffPCText:     db "DESCONEXIÓN@"
 
 BillsPC_::
 	ld hl, wd730
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm
index 1965a949..eb8c4890 100755
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -480,3 +480,13 @@ StatusScreen_PrintPP:
 	dec c
 	jr nz, StatusScreen_PrintPP
 	ret
+
+func_6cd5:
+	ld a, $80
+	ld [hli], a
+	ld a, $8F
+	ldd [hl], a
+	add hl, de
+	dec c
+	jr nz, func_6cd5
+	ret
diff --git a/home/list_menu.asm b/home/list_menu.asm
index c856e91d..66650225 100644
--- a/home/list_menu.asm
+++ b/home/list_menu.asm
@@ -210,6 +210,8 @@ DisplayChooseQuantityMenu::
 	ld a, [wListMenuID]
 	cp PRICEDITEMLISTMENU
 	jr nz, .printInitialQuantity
+	ld a, "¥"
+	ld [wTileMap+$DA], a
 	hlcoord 8, 10
 .printInitialQuantity
 	ld de, InitialQuantityText
@@ -420,6 +422,7 @@ PrintListMenuEntries::
 	add hl, bc
 	ld c, $a3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes
 	call PrintBCDNumber
+	ld [hl], "¥"
 .skipPrintingItemPrice
 	ld a, [wListMenuID]
 	and a ; PCPOKEMONLISTMENU?
@@ -523,4 +526,4 @@ PrintListMenuEntries::
 	jp PlaceString
 
 ListMenuCancelText::
-	db "CANCEL@"
+	db "SALIR@"
diff --git a/home/names.asm b/home/names.asm
index f7751fa0..57cdca3a 100644
--- a/home/names.asm
+++ b/home/names.asm
@@ -102,9 +102,9 @@ GetMachineName::
 	ret
 
 TechnicalPrefix::
-	db "TM"
+	db "MT"
 HiddenPrefix::
-	db "HM"
+	db "MO"
 
 ; sets carry if item is HM, clears carry if item is not HM
 ; Input: a = item ID
diff --git a/home/text_script.asm b/home/text_script.asm
index a6881dc5..377229e1 100644
--- a/home/text_script.asm
+++ b/home/text_script.asm
@@ -199,6 +199,17 @@ DisplayPlayerBlackedOutText::
 	ld a, [wd732]
 	res 5, a ; reset forced to use bike bit
 	ld [wd732], a
+	ld a,[$D795]
+	bit 7, a
+	jr z, .didnotblackoutinsafari
+	xor a
+	ld [wNumSafariBalls], a
+	ld [wSafariSteps], a
+	ld [wSafariSteps+1], a
+	ld [$D795], a
+	ld [wcf0d], a
+	ld [wSafariZoneGateCurScript], a
+.didnotblackoutinsafari
 	jp HoldTextDisplayOpen
 
 PlayerBlackedOutText::
diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm
index f5f0539e..6fa42240 100755
--- a/scripts/BikeShop.asm
+++ b/scripts/BikeShop.asm
@@ -79,11 +79,11 @@ BikeShopText1:
 	jp TextScriptEnd
 
 BikeShopMenuText:
-	db   "BICYCLE"
-	next "CANCEL@"
+	db   "BICICLETA"
+	next "SALIR@"
 
 BikeShopMenuPrice:
-	db "¥1000000@"
+	db "1000000¥@"
 
 BikeShopText_1d810:
 	text_far _BikeShopText_1d810
diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm
index 221834de..2575ed60 100755
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -281,6 +281,8 @@ PewterCityText_19431:
 
 PewterCityText5:
 	text_asm
+	ld a, $FC
+	ld [wJoyIgnore], a
 	ld hl, PewterCityText_1945d
 	call PrintText
 	xor a