diff --git a/STYLE.md b/STYLE.md index 6f26a7e..e2d8bb7 100644 --- a/STYLE.md +++ b/STYLE.md @@ -2,7 +2,7 @@ These guidelines are to be applied to all code contributed to the `tumbledemerald` project. -- Decapitalise everything! For example, change "POKéMON" to "Pokémon". +- Decapitalise everything! For example, change "POKéMON" to "Pokémon". (not yet though) - Always type "Pokémon" with the "é" Unicode character! - When typing "Pokédex", make sure to type it without a capital "D". - Use good English at all times. diff --git a/data/text/save.inc b/data/text/save.inc index 4d17327..c183ead 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -3,12 +3,10 @@ gText_ConfirmSave:: .string "Would you like to save the game?$" gText_AlreadySavedFile:: - .string "There is already a saved file.\n" - .string "Is it okay to overwrite it?$" + .string "u sus$" gText_SavingDontTurnOff:: - .string "SAVING…\n" - .string "DON'T TURN OFF THE POWER.$" + .string "Now saving…$" gText_PlayerSavedGame:: .string "{PLAYER} saved the game.$" @@ -29,5 +27,4 @@ gText_SaveError:: .string "backup memory.$" gText_SavingDontTurnOffPower:: - .string "SAVING…\n" - .string "DON'T TURN OFF THE POWER.$" + .string "Now saving…" diff --git a/src/menu.c b/src/menu.c index 6b915f9..d0e1bbe 100644 --- a/src/menu.c +++ b/src/menu.c @@ -474,8 +474,7 @@ void DisplayYesNoMenuWithDefault(u8 initialCursorPos) u32 GetPlayerTextSpeed(void) { - if (gTextFlags.forceMidTextSpeed) - return OPTIONS_TEXT_SPEED_MID; +return OPTIONS_TEXT_SPEED_FAST; return gSaveBlock2Ptr->optionsTextSpeed; }