tbld/tumbledemerald-legacy
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 5 Wiki Activity

Merge branch 'fast-saving' into 'main'

Browse Source 
Speed up saving

See merge request tbld/game!2
This commit is contained in:
Jess 2022-05-20 14:15:27 +00:00
commit 87dec7891d
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
STYLE.md
View File

@ -2,7 +2,7 @@
These guidelines are to be applied to all code contributed to the `tumbledemerald` project. 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! - Always type "Pokémon" with the "é" Unicode character!
- When typing "Pokédex", make sure to type it without a capital "D". - When typing "Pokédex", make sure to type it without a capital "D".
- Use good English at all times. - Use good English at all times.

9
data/text/save.inc
View File

@ -3,12 +3,10 @@ gText_ConfirmSave::
.string "Would you like to save the game?$" .string "Would you like to save the game?$"
gText_AlreadySavedFile:: gText_AlreadySavedFile::
.string "There is already a saved file.\n" .string "u sus$"
.string "Is it okay to overwrite it?$"
gText_SavingDontTurnOff:: gText_SavingDontTurnOff::
.string "SAVING…\n" .string "Now saving…$"
.string "DON'T TURN OFF THE POWER.$"
gText_PlayerSavedGame:: gText_PlayerSavedGame::
.string "{PLAYER} saved the game.$" .string "{PLAYER} saved the game.$"
@ -29,5 +27,4 @@ gText_SaveError::
.string "backup memory.$" .string "backup memory.$"
gText_SavingDontTurnOffPower:: gText_SavingDontTurnOffPower::
.string "SAVING…\n" .string "Now saving…"
.string "DON'T TURN OFF THE POWER.$"

3
src/menu.c
View File

@ -474,8 +474,7 @@ void DisplayYesNoMenuWithDefault(u8 initialCursorPos)
u32 GetPlayerTextSpeed(void) u32 GetPlayerTextSpeed(void)
{ {
if (gTextFlags.forceMidTextSpeed) return OPTIONS_TEXT_SPEED_FAST;
return OPTIONS_TEXT_SPEED_MID;
return gSaveBlock2Ptr->optionsTextSpeed; return gSaveBlock2Ptr->optionsTextSpeed;
} }