Skip to content

Commit 437d61e

Browse files
committed
Space between number and unit.
1 parent 40f93b2 commit 437d61e

File tree

49 files changed

+146
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+146
-165
lines changed

SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ std::string download_file(Logger& logger, const std::string& url){
4848
timer.singleShot(
4949
5000, [&downloaded_data, &url](){
5050
if (downloaded_data.isEmpty()){
51-
throw ConnectionException(nullptr, "Couldn't retrieved file from url : " + url + " after 5s");
51+
throw ConnectionException(nullptr, "Couldn't retrieved file from url : " + url + " after 5 seconds.");
5252
}
5353
});
5454
timer.stop();

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ConsoleSettings::ConsoleSettings()
2626
, SETTINGS_TO_HOME_DELAY0(
2727
"<b>Settings to Home Delay:</b><br>Delay from pressing home anywhere in the settings to return to the home menu.",
2828
LockMode::LOCK_WHILE_RUNNING,
29-
"960ms"
29+
"960 ms"
3030
)
3131
, START_GAME_REQUIRES_INTERNET(
3232
"<b>Start Game Requires Internet:</b><br>"
@@ -39,7 +39,7 @@ ConsoleSettings::ConsoleSettings()
3939
"<b>Start Game Internet Check Delay:</b><br>"
4040
"If starting the game requires checking the internet, wait this long for it.",
4141
LockMode::LOCK_WHILE_RUNNING,
42-
"3000ms"
42+
"3000 ms"
4343
)
4444
, TOLERATE_SYSTEM_UPDATE_MENU_FAST(
4545
"<b>Tolerate System Update Menu (fast):</b><br>"

SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,74 +25,74 @@ GameSettings::GameSettings()
2525
, OVERWORLD_TO_MENU_DELAY0(
2626
"<b>Overworld to Menu Delay:</b><br>Delay to bring up the menu when pressing X in the overworld.",
2727
LockMode::LOCK_WHILE_RUNNING,
28-
"2000ms"
28+
"2000 ms"
2929
)
3030
, MENU_TO_OVERWORLD_DELAY0(
3131
"<b>Menu to Overworld Delay:</b><br>Delay to go from menu back to overworld.",
3232
LockMode::LOCK_WHILE_RUNNING,
33-
"2000ms"
33+
"2000 ms"
3434
)
3535
, GAME_TO_HOME_DELAY0(
3636
"<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
3737
LockMode::LOCK_WHILE_RUNNING,
38-
"1000ms"
38+
"1000 ms"
3939
)
4040
, m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
4141
, START_GAME_MASH0(
4242
"<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
4343
LockMode::LOCK_WHILE_RUNNING,
44-
"2000ms"
44+
"2000 ms"
4545
)
4646
, START_GAME_WAIT0(
4747
"<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
4848
LockMode::LOCK_WHILE_RUNNING,
49-
"300s"
49+
"300 s"
5050
)
5151
, ENTER_GAME_MASH0(
5252
"<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
5353
LockMode::LOCK_WHILE_RUNNING,
54-
"5000ms"
54+
"5000 ms"
5555
)
5656
, ENTER_GAME_WAIT0(
5757
"<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
5858
LockMode::LOCK_WHILE_RUNNING,
59-
"300s"
59+
"300 s"
6060
)
6161
, m_box_timings("<font size=4><b>Box Timings:</b></font> (for egg programs)")
6262
, BOX_SCROLL_DELAY0(
6363
"<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
6464
LockMode::LOCK_WHILE_RUNNING,
65-
"240ms"
65+
"240 ms"
6666
)
6767
, BOX_CHANGE_DELAY0(
6868
"<b>Box Change Delay:</b><br>Delay to change boxes.",
6969
LockMode::LOCK_WHILE_RUNNING,
70-
"1600ms"
70+
"1600 ms"
7171
)
7272
, BOX_PICKUP_DROP_DELAY0(
7373
"<b>Box Pickup/Drop Delay:</b><br>Delay to pickup/drop " + STRING_POKEMON + ".",
7474
LockMode::LOCK_WHILE_RUNNING,
75-
"400ms"
75+
"400 ms"
7676
)
7777
, MENU_TO_POKEMON_DELAY0(
7878
"<b>Menu To " + STRING_POKEMON + " Delay:</b><br>Delay to enter " + STRING_POKEMON + " menu.",
7979
LockMode::LOCK_WHILE_RUNNING,
80-
"2400ms"
80+
"2400 ms"
8181
)
8282
, POKEMON_TO_BOX_DELAY1(
8383
"<b>" + STRING_POKEMON + " to Box Delay:</b><br>Delay to enter box system.",
8484
LockMode::LOCK_WHILE_RUNNING,
85-
"2560ms"
85+
"2560 ms"
8686
)
8787
, BOX_TO_POKEMON_DELAY0(
8888
"<b>Box to " + STRING_POKEMON + " Delay:</b><br>Delay to exit box system.",
8989
LockMode::LOCK_WHILE_RUNNING,
90-
"2000ms"
90+
"2000 ms"
9191
)
9292
, POKEMON_TO_MENU_DELAY0(
9393
"<b>" + STRING_POKEMON + " to Menu Delay:</b><br>Delay to return to menu.",
9494
LockMode::LOCK_WHILE_RUNNING,
95-
"2000ms"
95+
"2000 ms"
9696
)
9797
, m_advanced_options(
9898
"<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ EggAutonomous::EggAutonomous()
6060
, TRAVEL_TIME_PER_FETCH0(
6161
"<b>Travel Time per Fetch:</b><br>Fetch an egg after traveling for this long.",
6262
LockMode::LOCK_WHILE_RUNNING,
63-
"20s"
63+
"20 s"
6464
)
6565
, NUM_EGGS_IN_COLUMN(
6666
"<b>Num Eggs in Column:</b><br>How many eggs already deposited in the first column in Box 1.",
@@ -124,7 +124,7 @@ EggAutonomous::EggAutonomous()
124124
"<b>Scroll to Read Delay:</b><br>Wait this long after scrolling in the box to read the " + STRING_POKEMON + "'s stats. "
125125
"Increase this if your video has high latency.",
126126
LockMode::LOCK_WHILE_RUNNING,
127-
"1000ms"
127+
"1000 ms"
128128
)
129129
{
130130
PA_ADD_OPTION(GO_HOME_WHEN_DONE);

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ EggFetcher::EggFetcher()
5454
, TRAVEL_TIME_PER_FETCH0(
5555
"<b>Travel Time per Fetch:</b><br>Fetch an egg after traveling for this long.",
5656
LockMode::LOCK_WHILE_RUNNING,
57-
"15s"
57+
"15 s"
5858
)
5959
, NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
6060
, NOTIFICATIONS({

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ EggHatcher::EggHatcher()
7070
, SAFETY_TIME1(
7171
"<b>Safety Time:</b><br>Additional time added to the spinning.",
7272
LockMode::LOCK_WHILE_RUNNING,
73-
"10000ms"
73+
"10000 ms"
7474
)
7575
, HATCH_DELAY0(
7676
"<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
7777
LockMode::LOCK_WHILE_RUNNING,
78-
"105s"
78+
"105 s"
7979
)
8080
{
8181
PA_ADD_OPTION(GO_HOME_WHEN_DONE);

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ AmitySquarePickUpFarmer::AmitySquarePickUpFarmer()
5151
, ONE_WAY_MOVING_TIME0(
5252
"<b>One Way walking Time:</b><br>Walk this amount of time in one direction before going back to finish one round of walking.",
5353
LockMode::LOCK_WHILE_RUNNING,
54-
"5000ms"
54+
"5000 ms"
5555
)
5656
, ROUNDS_PER_FETCH(
5757
"<b>Rounds per fetch:</b><br>How many rounds of walking before doing a berry fetch attempt.",
@@ -61,7 +61,7 @@ AmitySquarePickUpFarmer::AmitySquarePickUpFarmer()
6161
, WAIT_TIME_FOR_POKEMON0(
6262
"<b>Wait Time for Pokemon:</b><br>Wait this time for pokemon to catch up to you before you ask for a berry.",
6363
LockMode::LOCK_WHILE_RUNNING,
64-
"3000ms"
64+
"3000 ms"
6565
)
6666
, NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
6767
, NOTIFICATIONS({

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ DoublesLeveling::DoublesLeveling()
6666
, EXIT_BATTLE_TIMEOUT0(
6767
"<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
6868
LockMode::LOCK_WHILE_RUNNING,
69-
"10s"
69+
"10 s"
7070
)
7171
{
7272
PA_ADD_OPTION(GO_HOME_WHEN_DONE);

SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ActivateMenuGlitch112::ActivateMenuGlitch112()
4040
"<b>Fly Menu A-to-X Delay:</b><br>The delay between the A and X presses to overlap the menu with the fly option.<br>"
4141
"(German players may need to increase this to 90.)",
4242
LockMode::LOCK_WHILE_RUNNING,
43-
160ms, "400ms"
43+
160ms, "400 ms"
4444
)
4545
{
4646
PA_ADD_OPTION(FLY_A_TO_X_DELAY0);

SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ActivateMenuGlitch113::ActivateMenuGlitch113()
3939
"<b>Fly Menu A-to-X Delay:</b><br>The delay between the A and X presses to overlap the menu with the fly option.<br>"
4040
"(German players may need to increase this to 90.)",
4141
LockMode::LOCK_WHILE_RUNNING,
42-
160ms, "400ms"
42+
160ms, "400 ms"
4343
)
4444
{
4545
PA_ADD_OPTION(FLY_A_TO_X_DELAY0);

0 commit comments

Comments
 (0)