File tree Expand file tree Collapse file tree 3 files changed +40
-7
lines changed Expand file tree Collapse file tree 3 files changed +40
-7
lines changed Original file line number Diff line number Diff line change @@ -1115,13 +1115,13 @@ void displayBlimpTicketSkipDetails()
1115
1115
BlimpTicketSkip.StraightUpTimerStopped = false ;
1116
1116
}
1117
1117
1118
- # ifdef TTYD_JP
1118
+ double StickAngle = getStickAngle ( nullptr );
1119
1119
double UpRightAngleStart = 25 ;
1120
- #else
1121
- double UpRightAngleStart = 27 ;
1120
+
1121
+ #ifdef TTYD_JP
1122
+ UpRightAngleStart += 2 ;
1122
1123
#endif
1123
1124
1124
- double StickAngle = getStickAngle (nullptr );
1125
1125
if (StickAngle >= UpRightAngleStart)
1126
1126
{
1127
1127
// Stop the up-right timer when the angle held reaches or exceeds 25 for JP, or 27 for US/EU
Original file line number Diff line number Diff line change 3
3
4
4
namespace mod {
5
5
6
- const char *VersionNumber = " v3.0.34 " ;
6
+ const char *VersionNumber = " v3.0.35 " ;
7
7
8
8
const char *RootLines[] =
9
9
{
Original file line number Diff line number Diff line change @@ -2496,8 +2496,41 @@ void menuCheckButton()
2496
2496
case A:
2497
2497
{
2498
2498
// Flip the bool for the current display
2499
- bool DisplayActive = Displays[tempMenuSelectedOption];
2500
- Displays[tempMenuSelectedOption] = !DisplayActive;
2499
+ bool DisplayActive = !Displays[tempMenuSelectedOption];
2500
+ Displays[tempMenuSelectedOption] = DisplayActive;
2501
+
2502
+ // Exit if the display was turned off
2503
+ if (!DisplayActive)
2504
+ {
2505
+ break ;
2506
+ }
2507
+
2508
+ // If one of the trick displays was turned on, then turn off the other trick displays
2509
+ switch (tempMenuSelectedOption)
2510
+ {
2511
+ case YOSHI_SKIP:
2512
+ {
2513
+ Displays[PALACE_SKIP] = false ;
2514
+ Displays[BLIMP_TICKET_SKIP] = false ;
2515
+ break ;
2516
+ }
2517
+ case PALACE_SKIP:
2518
+ {
2519
+ Displays[YOSHI_SKIP] = false ;
2520
+ Displays[BLIMP_TICKET_SKIP] = false ;
2521
+ break ;
2522
+ }
2523
+ case BLIMP_TICKET_SKIP:
2524
+ {
2525
+ Displays[YOSHI_SKIP] = false ;
2526
+ Displays[PALACE_SKIP] = false ;
2527
+ break ;
2528
+ }
2529
+ default :
2530
+ {
2531
+ break ;
2532
+ }
2533
+ }
2501
2534
break ;
2502
2535
}
2503
2536
case B:
You can’t perform that action at this time.
0 commit comments