summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorklektron <klektron@users.noreply.github.com>2020-12-29 21:54:33 +0100
committerklektron <klektron@users.noreply.github.com>2020-12-29 21:54:33 +0100
commitaf2eb191837e9c2921b7e8015874568675f32e9f (patch)
treed72f094ed69238f89297ce031c4b14eed14515a8 /data
parent0c92d318cce58a42fa15d7989f9999d324c7475d (diff)
more changes
Diffstat (limited to 'data')
-rw-r--r--data/text_boxes.asm36
1 files changed, 6 insertions, 30 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 "キャンセル@"