summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/events/prizes.asm2
-rw-r--r--data/text/text_2.asm8
-rw-r--r--data/text_boxes.asm10
3 files changed, 11 insertions, 9 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@"