From cfa659905f9d0eee269dd708601ed27fb7b3c1a0 Mon Sep 17 00:00:00 2001
From: jugeeya <jugeeya@live.com>
Date: Tue, 8 Aug 2023 11:49:19 -0700
Subject: [PATCH] Updates to triggers, including text
---
src/common/button_config.rs | 4 ++--
training_mod_consts/src/lib.rs | 10 +++++-----
training_mod_consts/src/options.rs | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/common/button_config.rs b/src/common/button_config.rs
index dff3f53..a0ca4b2 100644
--- a/src/common/button_config.rs
+++ b/src/common/button_config.rs
@@ -25,11 +25,11 @@ pub fn button_mapping(
},
ButtonConfig::ZL => match style {
GCController => b.l() || b.real_digital_l(),
- _ => b.zl(),
+ _ => b.zl() || b.left_sl() || b.right_sl(),
},
ButtonConfig::ZR => match style {
GCController => b.r() || b.real_digital_r(),
- _ => b.zr(),
+ _ => b.zr() || b.left_sr() || b.right_sr(),
},
ButtonConfig::DpadUp => b.dpad_up(),
ButtonConfig::DpadDown => b.dpad_down(),
diff --git a/training_mod_consts/src/lib.rs b/training_mod_consts/src/lib.rs
index 030685f..39b9fee 100644
--- a/training_mod_consts/src/lib.rs
+++ b/training_mod_consts/src/lib.rs
@@ -159,7 +159,7 @@ pub static DEFAULTS_MENU: TrainingModpackMenu = TrainingModpackMenu {
save_state_slot: SaveStateSlot::One,
randomize_slots: OnOff::Off,
save_state_mirroring: SaveStateMirroring::None,
- save_state_playback: PlaybackSlot::S1,
+ save_state_playback: PlaybackSlot::empty(),
sdi_state: Direction::empty(),
sdi_strength: SdiFrequency::None,
shield_state: Shield::None,
@@ -190,13 +190,13 @@ pub static DEFAULTS_MENU: TrainingModpackMenu = TrainingModpackMenu {
playback_loop: OnOff::Off,
menu_open_hold: ButtonConfig::B,
menu_open_press: ButtonConfig::DpadUp,
- save_state_save_hold: ButtonConfig::L,
+ save_state_save_hold: ButtonConfig::ZL,
save_state_save_press: ButtonConfig::DpadDown,
- save_state_load_hold: ButtonConfig::L,
+ save_state_load_hold: ButtonConfig::ZL,
save_state_load_press: ButtonConfig::DpadUp,
- input_record_hold: ButtonConfig::R,
+ input_record_hold: ButtonConfig::ZR,
input_record_press: ButtonConfig::DpadDown,
- input_playback_hold: ButtonConfig::R,
+ input_playback_hold: ButtonConfig::ZR,
input_playback_press: ButtonConfig::DpadUp,
};
diff --git a/training_mod_consts/src/options.rs b/training_mod_consts/src/options.rs
index 4020ffe..7c08895 100644
--- a/training_mod_consts/src/options.rs
+++ b/training_mod_consts/src/options.rs
@@ -1473,10 +1473,10 @@ impl ButtonConfig {
ButtonConfig::B => "B",
ButtonConfig::X => "X",
ButtonConfig::Y => "Y",
- ButtonConfig::L => "L",
- ButtonConfig::R => "R",
- ButtonConfig::ZL => "ZL",
- ButtonConfig::ZR => "ZR",
+ ButtonConfig::L => "Pro L",
+ ButtonConfig::R => "Pro R; GCC Z",
+ ButtonConfig::ZL => "Pro ZL; GCC L",
+ ButtonConfig::ZR => "Pro ZR; GCC R",
ButtonConfig::DpadUp => "DPad Up",
ButtonConfig::DpadDown => "DPad Down",
ButtonConfig::DpadLeft => "DPad Left",