Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void start_game_from_home(
enter_game(
context,
backup_save,
GameSettings::instance().ENTER_GAME_MASH0,
GameSettings::instance().ENTER_GAME_MASH1,
GameSettings::instance().ENTER_GAME_WAIT0
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ GameSettings::GameSettings()
LockMode::LOCK_WHILE_RUNNING,
"20000 ms"
)
, ENTER_GAME_MASH0(
, ENTER_GAME_MASH1(
"<b>Enter Game Mash:</b><br>Mash A for this long to enter the game.",
LockMode::LOCK_WHILE_RUNNING,
"3000 ms"
"1000 ms"
)
, ENTER_GAME_WAIT0(
"<b>Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
Expand Down Expand Up @@ -241,7 +241,7 @@ GameSettings::GameSettings()

PA_ADD_STATIC(m_start_game_timings);
PA_ADD_OPTION(START_GAME_WAIT0);
PA_ADD_OPTION(ENTER_GAME_MASH0);
PA_ADD_OPTION(ENTER_GAME_MASH1);
PA_ADD_OPTION(ENTER_GAME_WAIT0);

PA_ADD_STATIC(m_den_timings);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class GameSettings : public BatchOption{

SectionDividerOption m_start_game_timings;
MillisecondsOption START_GAME_WAIT0;
MillisecondsOption ENTER_GAME_MASH0;
MillisecondsOption ENTER_GAME_MASH1;
MillisecondsOption ENTER_GAME_WAIT0;

SectionDividerOption m_den_timings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void enter_loading_game(
openedgame_to_gamemenu(stream, context, GameSettings::instance().START_GAME_WAIT0);

stream.log("enter_loading_game(): Game Loaded. Entering game...", COLOR_PURPLE);
enter_game(context, backup_save, GameSettings::instance().ENTER_GAME_MASH0, 0ms);
enter_game(context, backup_save, GameSettings::instance().ENTER_GAME_MASH1, 0ms);
context.wait_for_all_requests();

// Wait to enter game.
Expand Down
Loading