diff --git a/text/define_text.inc.c b/text/define_text.inc.c index d33031f67..a7925f17a 100644 --- a/text/define_text.inc.c +++ b/text/define_text.inc.c @@ -1,41 +1,3 @@ -// == debug table == - -#ifndef VERSION_EU - -// (this wasn't translated for US, and was removed in EU) - -static const u8 Debug0[] = { - _("STAGE SELECT\n" - " つづける?\n" - " 1 マウンテン\n" - " 2 ファイアーバブル\n" - " 3 スノースライダー\n" - " 4 ウォーターランド\n" - "   クッパ1ごう\n" - " もどる") -}; - -static const u8 Debug1[] = { - _("PAUSE    \n" - " つづける?\n" - " やめる ?") -}; - -static const struct DialogEntry debug_text_entry_0 = { - 1, 8, 30, 200, Debug0 -}; - -static const struct DialogEntry debug_text_entry_1 = { - 1, 3, 100, 150, Debug1 -}; - -const struct DialogEntry *const seg2_debug_text_table[] = { - &debug_text_entry_0, &debug_text_entry_1, NULL, -}; - -#endif - - // == dialog == // (defines en_dialog_table etc.) diff --git a/text/jp/dialogs.h b/text/jp/dialogs.h index 014cb9314..d40143ee4 100644 --- a/text/jp/dialogs.h +++ b/text/jp/dialogs.h @@ -1,20 +1,11 @@ // Parameters: dialog enum ID, (unused), lines per box, left offset, width -#ifdef VERSION_JP -#define HOW_TO_READ_SIGNS_1 "\ -カンバンを よむときも\n\ -たちどまって Bボタン!\n\ -AかBボタンですすめる!\n\ -まえにたつだけで はなし\n\ -かける、どうぶつもいます。" -#else #define HOW_TO_READ_SIGNS_1 "\ カンバンは まえにたって\n\ AかBボタンでよめます。\n\ まえにたつだけで はなし\n\ かけてくれる どうぶつも\n\ います。" -#endif DEFINE_DIALOG(DIALOG_000, 1, 5, 30, 200, _("\ おおっと、ここはキケンな\n\ @@ -1089,11 +1080,7 @@ DEFINE_DIALOG(DIALOG_094, 1, 3, 30, 200, _("\ はしりながら Zボタンで\n\ しゃがんで ジャンプだ!")) -#ifdef VERSION_JP -#define HOW_TO_READ_SIGNS_2 " Bボタンをおすと" -#else #define HOW_TO_READ_SIGNS_2 "AかBボタンをおし" -#endif DEFINE_DIALOG(DIALOG_095, 1, 3, 30, 200, _("\ このように カンバンの\n\ @@ -1881,15 +1868,6 @@ DEFINE_DIALOG(DIALOG_166, 1, 6, 30, 200, _("\ くるといいッス!\n\        ノコノコ")) -#ifdef VERSION_JP -#define A_BUTTON_ACT "\ -Aボタン『ジャンプ』\n" -#define B_BUTTON_ACT "\ -Bボタン『カンバンよむ』\n\ -    『パンチ』\n\ -    『ものをもつ』\n\ -もういちどおす『なげる』" -#else #define A_BUTTON_ACT "\ Aボタン『ジャンプ』\n\     『カンバンよむ』\n" @@ -1899,7 +1877,6 @@ DEFINE_DIALOG(DIALOG_166, 1, 6, 30, 200, _("\     『ものをもつ』\n\  もういちどおすと\n\     『なげる』" -#endif DEFINE_DIALOG(DIALOG_167, 1, 4, 30, 200, _("\ 『ピーチの おしろ』\n\ diff --git a/text/us/dialogs.h b/text/us/dialogs.h index 00b89f486..4b8110665 100644 --- a/text/us/dialogs.h +++ b/text/us/dialogs.h @@ -5,15 +5,11 @@ #define PLASTERED "splattered" #define SCAM_ME "cheat!\n" #define SCRAM "get lost" -#define YOU_CANT_SWIM_IN_IT "It is too heavy to\nswim with." -#define GIVE_UP "give up" #else #define COMRADES "comrades" #define PLASTERED "plastered" #define SCAM_ME "scam\nME. " #define SCRAM "scram--" -#define YOU_CANT_SWIM_IN_IT "You can't swim in it." -#define GIVE_UP "give" #endif DEFINE_DIALOG(DIALOG_000, 1, 6, 30, 200, _("\ @@ -784,8 +780,9 @@ by enemy attacks.\n\ You don't even have to\n\ breathe while wearing it.\n\ \n\ -The only problem:\n" -YOU_CANT_SWIM_IN_IT)) +The only problem:\n\ +It is too heavy to\n\ +swim with.")) DEFINE_DIALOG(DIALOG_063, 1, 5, 30, 200, _("\ The Vanish Cap is inside\n\ @@ -1866,7 +1863,7 @@ Waaaaaaaaaaaaaaaaa!!!")) DEFINE_DIALOG(DIALOG_152, 1, 3, 30, 200, _("\ Owwch! Uncle! Uncle!\n\ -Okay, I " GIVE_UP ". Take this\n\ +Okay, I give up. Take this\n\ Star!\n\ Whew! I feel better now.\n\ I don't really need it\n\