aaaand more fixes

11 files changed, 31 insertions, 31 deletions

diff --git a/data/events/prizes.asm b/data/events/prizes.asm
index 684add94..67186815 100755
--- a/data/events/prizes.asm
+++ b/data/events/prizes.asm
@@ -4,7 +4,7 @@ PrizeDifferentMenuPtrs:
 	dw PrizeMenuTMsEntries,  PrizeMenuTMsCost
 
 NoThanksText:
-	db "NO THANKS@"
+	db "NO GRACIAS@"
 
 PrizeMenuMon1Entries:
 	db ABRA
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index 3ff26d58..a8b80799 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -432,7 +432,7 @@ _MagazinesText::
 
 _BillsHouseMonitorText::
 	text "¡En el monitor"
-	line "del PC aparece"
+	line "del PC aparece el"
 	cont "TELETRANSPORTE!"
 	done
 
@@ -1289,7 +1289,7 @@ _BuildingRageText::
 	prompt
 
 _MirrorMoveFailedText::
-	text "El MOVIMIENTO en"
+	text "¡El MOVIMIENTO en"
 	next "ESPEJO falló!"
 	prompt
 
@@ -1699,6 +1699,8 @@ _BoxFullText::
 	prompt
 
 _MonIsTakenOutText::
+	text "Retirado"
+	line "@"
 	text_ram wcf4b
 	text "."
 	cont "Recibes"
@@ -1717,7 +1719,7 @@ _CantTakeMonText::
 	line "más #MON."
 
 	para "Primero deposita"
-	line "algún #MON"
+	line "algún #MON."
 	prompt
 
 _ReleaseWhichMonText::
diff --git a/data/text_boxes.asm b/data/text_boxes.asm
index 16dc91d1..b9fc70a1 100644
--- a/data/text_boxes.asm
+++ b/data/text_boxes.asm
@@ -25,24 +25,24 @@ 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, BuySellQuitText,          3,  0
-	text_box_text USE_TOSS_MENU_TEMPLATE,            13, 10, 19, 14, UseTossText,             15, 11
+	text_box_text USE_TOSS_MENU_TEMPLATE,            12, 10, 19, 14, UseTossText,             16, 11
 	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 BUY_SELL_QUIT_MENU_TEMPLATE,        0,  0, 10,  6, $7482,                    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, BuySellQuitText,          8,  8
 	text_box_text JP_POKEDEX_MENU_TEMPLATE,          11,  8, 19, 17, BuySellQuitText,         12, 10
 
 BuySellQuitText:
-	db   "COMPRAR"
+	db "@" ; unused
+
+	db   "COMPRAR" ; $7482
 	next "VENDER"
 	next "¡ADIÓS!@"
 
-	;db "@" ; unused
-
 UseTossText:
 	db   "USAR"
 	next "TIRAR@"
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index 0c56dd88..b357f8f3 100755
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -120,10 +120,9 @@ LoadTownMap_Nest:
 	push hl
 	call DisplayWildLocations
 	call GetMonName
-	hlcoord 1, 0
+	hlcoord 9, 0
 	call PlaceString
-	ld h, b
-	ld l, c
+	hlcoord 1, 0
 	ld de, MonsNestText
 	call PlaceString
 	call WaitForTextScrollButtonPress
@@ -134,7 +133,7 @@ LoadTownMap_Nest:
 	ret
 
 MonsNestText:
-	db "'s NEST@"
+	db "NIDO DE @"
 
 LoadTownMap_Fly::
 	call ClearSprites
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 9620a2d0..ac2aa3c0 100755
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -425,7 +425,7 @@ PrintPlayTime:
 
 SaveScreenInfoText:
 	db   "JUGAD."
-	next "MEDALLAS  "
+	next "MEDALLAS    "
 	next "#DEX    "
 	next "TIEMPO@"
 
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm
index 6648ab54..2fdd9cd1 100755
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
@@ -108,9 +108,9 @@ RedrawPartyMenu_::
 	inc c
 	jp .loop
 .ableToLearnMoveText
-	db "ABLE@"
+	db "PUEDE@"
 .notAbleToLearnMoveText
-	db "NOT ABLE@"
+	db "NO PUEDE@"
 .evolutionStoneMenu
 	push hl
 	ld hl, EvosMovesPointerTable
@@ -165,9 +165,9 @@ RedrawPartyMenu_::
 	pop hl
 	jr .printLevel
 .ableToEvolveText
-	db "ABLE@"
+	db "PUEDE@"
 .notAbleToEvolveText
-	db "NOT ABLE@"
+	db "NO PUEDE@"
 .afterDrawingMonEntries
 	ld b, SET_PAL_PARTY_MENU
 	call RunPaletteCommand
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 2a405400..b05c271b 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -399,7 +399,7 @@ PrintGameVersionOnTitleScreen:
 ; these point to special tiles specifically loaded for that purpose and are not usual text
 VersionOnTitleScreenText:
 IF DEF(_RED)
-	db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,"@" ; "Edición Roja"
+	db $60,$61,$62,$63,$64,$65,$66,$67,"@" ; "Edición Roja"
 ENDC
 IF DEF(_BLUE)
 	db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Edición Azul"
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 5dcef8ec..7a5c1fe6 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -461,7 +461,7 @@ InitializeSpriteScreenPosition:
 	ld b, a
 	ld a, [hl]      ; x#SPRITESTATEDATA2_MAPY
 	sub b           ; relative to player position
-	call Func_515D
+	call Func_5119
 	sub $4          ; - 4
 	dec h
 	ld [hli], a     ; [x#SPRITESTATEDATA1_YPIXELS]
@@ -470,20 +470,20 @@ InitializeSpriteScreenPosition:
 	ld b, a
 	ld a, [hli]     ; x#SPRITESTATEDATA2_MAPX
 	sub b           ; relative to player position
-	call Func_515D
+	call Func_5119
 	dec h
 	ld [hl], a      ; [x#SPRITESTATEDATA1_XPIXELS]
 	ret
 
-Func_515D:
-	jr nc, .asm_5166
+Func_5119:
+	jr nc, .asm_5122
 	cpl
 	inc a
 	swap a
 	cpl
 	inc a
 	ret
-.asm_5166
+.asm_5122
 	swap a
 	ret
 
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm
index eb8c4890..9d53c003 100755
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -221,7 +221,7 @@ OTText:
 	next "@"
 
 StatusText:
-	db "ESTADO/@"
+	db "ESTADO@"
 
 OKText:
 	db "OK@"
@@ -399,9 +399,8 @@ StatusScreen2:
 	inc a
 	ld [wLoadedMonLevel], a ; Increase temporarily if not 100
 .Level100
-	hlcoord 14, 6
-	ld [hl], "<to>"
-	inc hl
+	hlcoord 15, 6
+	ld [hl], "A"
 	inc hl
 	call PrintLevel
 	pop af
diff --git a/home/audio.asm b/home/audio.asm
index eded85e9..e1951fd5 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -185,7 +185,7 @@ PlaySound::
 	jr nz, .audio3
 ; audio 2
 	ld a, b
-	call Audio2_PlaySound
+	call $603A ; TODO Audio2_PlaySound??
 	jr .next2
 
 .audio3
diff --git a/home/list_menu.asm b/home/list_menu.asm
index 66650225..7ceac460 100644
--- a/home/list_menu.asm
+++ b/home/list_menu.asm
@@ -295,7 +295,7 @@ DisplayChooseQuantityMenu::
 	ld de, SpacesBetweenQuantityAndPriceText
 	call PlaceString
 	ld de, hMoney ; total price
-	ld c, $a3
+	ld c, $83
 	call PrintBCDNumber
 	hlcoord 9, 10
 .printQuantity
@@ -420,7 +420,7 @@ PrintListMenuEntries::
 	pop hl
 	ld bc, SCREEN_WIDTH + 5 ; 1 row down and 5 columns right
 	add hl, bc
-	ld c, $a3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes
+	ld c, $83 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes
 	call PrintBCDNumber
 	ld [hl], "¥"
 .skipPrintingItemPrice