diff --git a/dynos/smo_menu.txt b/dynos/smo_menu.txt index b7cd6b43..29716304 100644 --- a/dynos/smo_menu.txt +++ b/dynos/smo_menu.txt @@ -25,11 +25,11 @@ ID "SuperMarioOdyssey" TITLE "SUPER MARIO ODYSSEY" -TOGGLE "Mario's Moveset" "smo_mario" 0 -CHOICE "Cappy" "smo_cappy" 1 "Disabled" "No Capture" "Capture" -BIND "Cappy Throw Button" "key_cappy" 0x0040 0x002D 0x1002 0xFFFF -CHOICE "Health System" "smo_health" 2 "Disabled" "3-Health" "6-Health" -TOGGLE "Unlimited Cappy Jumps" "smo_ucj" 1 +TOGGLE "MARIO MOVESET" "smo_mario" 0 +CHOICE "CAPPY" "smo_cappy" 1 "DISABLED" "NO CAPTURE" "CAPTURE" +BIND "CAPPY THROW BUTTON" "key_cappy" 0x0040 0x002D 0x1002 0xFFFF +CHOICE "HEALTH SYSTEM" "smo_health" 2 "DISABLED" "3-HEALTH" "6-HEALTH" +TOGGLE "UNLIMITED CAPPY JUMPS" "smo_ucj" 1 MBUTTON "BACK TO MAIN MENU" "back_to_menu" "smo_return_to_main_menu" MBUTTON "GO TO LEVEL SELECT" "level_select" "go_to_level_select" diff --git a/dynos/time_trials_menu.txt b/dynos/time_trials_menu.txt index fac56612..7ad38dd6 100644 --- a/dynos/time_trials_menu.txt +++ b/dynos/time_trials_menu.txt @@ -25,11 +25,11 @@ ID "TimeTrials" TITLE "TIME TRIALS" -TOGGLE "Time Trials" "time_trials" 1 -CHOICE "Time Trial Ghost" "time_trials_ghost" 1 "Hide" "Show" -CHOICE "Main Courses Ghost" "time_trials_main" 0 "Selected Act Star" "100 Coins Star" -CHOICE "Bowser Courses Ghost" "time_trials_bowser" 0 "Bowser Fight" "Red Coins Star" -CHOICE "PSS Ghost" "time_trials_pss" 0 "Star 1" "Star 2" -TOGGLE "100 Coins Star Exit" "time_trials_100" 0 -TOGGLE "Time Trials with Cheats" "time_trials_cheats" 0 +TOGGLE "TIME TRIALS" "time_trials" 1 +CHOICE "TIME TRIAL GHOST" "time_trials_ghost" 1 "HIDE" "SHOW" +CHOICE "MAIN COURSES GHOST" "time_trials_main" 0 "SELECTED ACT STAR" "100 COINS STAR" +CHOICE "BOWSER COURSES GHOST" "time_trials_bowser" 0 "BOWSER FIGHT" "RED COINS STAR" +CHOICE "PSS GHOST" "time_trials_pss" 0 "STAR 1" "STAR 2" +TOGGLE "100 COINS STAR EXIT" "time_trials_100" 0 +TOGGLE "TIME TRIALS WITH CHEATS" "time_trials_cheats" 0 MBUTTON "RESTART LEVEL" "time_trials_restart" "time_trials_restart_level" diff --git a/src/pc/dynamic_options.inl b/src/pc/dynamic_options.inl index 0070881f..fc4b15b3 100644 --- a/src/pc/dynamic_options.inl +++ b/src/pc/dynamic_options.inl @@ -334,8 +334,8 @@ static struct SubMenu *dynos_read_file(const char *folder, const char *filename) option.uval = &dopt->uval; option.numChoices = 2; option.choices = dynos_alloc_choice_list(option.numChoices); - option.choices[0] = dynos_alloc_sm64_string("Disabled"); - option.choices[1] = dynos_alloc_sm64_string("Enabled"); + option.choices[0] = dynos_alloc_sm64_string("DISABLED"); + option.choices[1] = dynos_alloc_sm64_string("ENABLED"); } // SCROLL [Label] [Name] [InitialValue] [Min] [Max] [Step] @@ -558,14 +558,14 @@ void optmenu_draw_prompt_dynos() { if (sDynosMenu != NULL) { if (!optmenu_open) { if (sDynosOpenText == NULL) { - sDynosOpenText = dynos_alloc_sm64_string("[Z] DynOS"); + sDynosOpenText = dynos_alloc_sm64_string("[Z] DYNOS"); } gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); optmenu_draw_text(56, 212, sDynosOpenText, 0); gSPDisplayList(gDisplayListHead++, dl_ia_text_end); } else { if (sDynosCloseText == NULL) { - sDynosCloseText = dynos_alloc_sm64_string("[Z] Return"); + sDynosCloseText = dynos_alloc_sm64_string("[Z] RETURN"); } gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); optmenu_draw_text(56, 212, sDynosCloseText, 0); diff --git a/text/jp/dialogs_smo.h b/text/jp/dialogs_smo.h index 2421b439..8be85e28 100644 --- a/text/jp/dialogs_smo.h +++ b/text/jp/dialogs_smo.h @@ -1,43 +1,72 @@ /* Parameters: dialog enum ID, (unused), lines per box, left offset, width */ DEFINE_DIALOG(DIALOG_SMO_KING_BOBOMB, 1, 4, 30, 200, _("\ -What are you doing?\n\ -Trying to enter my royal\n\ -head to convince me to\n\ -give up?\n\ -Ha ha!\n\ -You're a fool if you\n\ -thought it would work!\n\ +WHAT ARE YOU\n\ +DOING?\n\ +TRYING TO\n\ +ENTER THE\n\ +ROYAL HEAD\n\ +TO\n\ +CONVINCE ME\n\ +TO GIVE UP?\n\ +HA HA!\n\ +YOU ARE A\n\ +FOOL IF YOU\n\ +THOUGHT IT\n\ +WOULD WORK!\n\ \n\ -You're facing the mighty\n\ -Bob-omb king! Your tricks\n\ -are useless against me!\n\ +YOU FACING\n\ +THE MIGHTY\n\ +BOBOMB KING!\n\ +YOUR TRICKS ARE\n\ +USELESS\n\ +AGAINST ME!\n\ \n\ -I'm not giving my Power\n\ -Star to a coward that\n\ -can't fight with his\n\ -bare hands!")) +I'M NOT GIVE\n\ +MY\n\ +POWER STAR\n\ +TO A COWARD\n\ +WHO CANNOT\n\ +FIGHT\n\ +WITH HIS\n\ +BARE HANDS!")) DEFINE_DIALOG(DIALOG_SMO_KING_WHOMP, 1, 4, 95, 200, _("\ -Hey, human! What are you\n\ -trying to do with your\n\ -strange cap?...\n\ -Going through my mind?\n\ -I don't know what you're\n\ -looking for, but you'll be\n\ -really disappointed!\n\ +HEY, HUMAN!\n\ +WHAT ARE\n\ +YOU TRYING\n\ +TO DO WITH\n\ +YOUR\n\ +STRANGE CAP?\n\ +GOING THROUGH\n\ +MY MIND?\n\ +I DON'T KNOW\n\ +WHAT YOU ARE\n\ +LOOKING FOR,\n\ +BUT YOU WILL\n\ +BE REALLY\n\ +DISAPPOINTED!\n\ \n\ -Everyone knows that my\n\ -head is like my body:\n\ -rock solid!\n\ +EVERYONE KNOWS\n\ +THAT MY\n\ +HEAD IS LIKE\n\ +MY BODY:\n\ +ROCK SOLID!\n\ \n\ -Nothing can break it!\n\ -Definitely not your\n\ -wierd cap, you wimp!\n\ +NOTHING CAN\n\ +BREAK IT!\n\ +DEFINITELY\n\ +NOT YOUR\n\ +WEIRD CAP,\n\ +YOU WIMP!\n\ \n\ -...What?\n\ -Hard to believe me?\n\ -Fine! I'll show you I'm\n\ -not cracking you a joke!\n\ -I'll make you flatter\n\ -than a pancake!")) +...WHAT?\n\ +HARD TO\n\ +BELIEVE ME?\n\ +FINE! I'LL\n\ +SHOW YOU I'M\n\ +NOT CRACKING\n\ +YOU A JOKE!\n\ +I'LL MAKE YOU\n\ +FLATTER\n\ +THAN A PANCAKE!"))