Skip to content

Commit 555df59

Browse files
committed
update notifications, unblock settings
1 parent 86ae4fb commit 555df59

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

SerialPrograms/Source/PokemonRSE/PokemonRSE_Panels.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
3838

3939
if (PreloadSettings::instance().DEVELOPER_MODE){
4040
ret.emplace_back("---- Test ----");
41-
ret.emplace_back(make_single_switch_program<StarterReset_Descriptor, StarterReset>());
41+
ret.emplace_back(make_single_switch_program<StarterReset_Descriptor, StarterReset>()); //outdated early test program
4242

4343
ret.emplace_back("---- Developer Tools ----");
4444
ret.emplace_back(make_single_switch_program<SoundListener_Descriptor, SoundListener>());

SerialPrograms/Source/PokemonRSE/PokemonRSE_Settings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ GameSettings::GameSettings()
5757
PA_ADD_OPTION(START_BUTTON_MASH);
5858
PA_ADD_OPTION(ENTER_GAME_WAIT);
5959
PA_ADD_STATIC(m_shiny_audio_settings);
60-
//PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
61-
//PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
60+
PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
61+
PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
6262
}
6363

6464

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace PokemonRSE{
2525
AudioStarterReset_Descriptor::AudioStarterReset_Descriptor()
2626
: SingleSwitchProgramDescriptor(
2727
"PokemonRSE:AudioStarterReset",
28-
"Pokemon RSE", "[RS] Starter Reset",
28+
"Pokemon RSE", "Starter Reset (Ruby/Sapphire)",
2929
"ComputerControl/blob/master/Wiki/Programs/PokemonRSE/AudioStarterReset.md",
3030
"Soft reset for a shiny starter. Ruby and Sapphire only.",
3131
FeedbackType::VIDEO_AUDIO_GBA,
@@ -92,7 +92,7 @@ void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseCont
9292
/*
9393
* Settings: Text Speed fast.
9494
* Full screen, no filter? The device I'm using to test has similar looking output, but I don't have switch online+.
95-
* If on a retro handheld, make sure the screen matches that of NSO+ and that there is an overlay to avoid the black border check.
95+
* If on a retro handheld, make sure the screen matches that of NSO+.
9696
*
9797
* Setup: Stand in front of the Professor's bag and save the game.
9898
*
@@ -157,7 +157,7 @@ void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseCont
157157
env.log("Shiny Poochyena detected!");
158158
stats.poochyena++;
159159
env.update_stats();
160-
send_program_status_notification(env, NOTIFICATION_SHINY_POOCH, "Shiny Poochyena found.", env.console.video().snapshot(), false);
160+
send_program_notification(env, NOTIFICATION_SHINY_POOCH, COLOR_YELLOW, "Shiny Poochyena found", {}, "", env.console.video().snapshot(), true);
161161
}
162162
else {
163163
env.log("Poochyena is not shiny.");
@@ -196,7 +196,7 @@ void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseCont
196196
env.log("Shiny starter detected!");
197197
stats.shinystarter++;
198198
env.update_stats();
199-
send_program_status_notification(env, NOTIFICATION_SHINY_STARTER, "Shiny starter found!", env.console.video().snapshot(), true);
199+
send_program_notification(env, NOTIFICATION_SHINY_STARTER, COLOR_YELLOW, "Shiny starter found!", {}, "", env.console.video().snapshot(), true);
200200
shiny_starter = true;
201201
}
202202
else {

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
8989
/*
9090
* Settings: Text Speed fast.
9191
* Full screen, no filter? The device I'm using to test has similar looking output, but I don't have switch online+.
92-
* If on a retro handheld, make sure the screen matches that of NSO+ and that there is an overlay to avoid the black border check.
92+
* If on a retro handheld, make sure the screen matches that of NSO+.
9393
*
9494
* Setup: Stand in front of the Professor's bag and save the game.
9595
*

0 commit comments

Comments
 (0)