1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-28 01:02:43 +00:00

Updates to triggers, including text

This commit is contained in:
jugeeya 2023-08-08 11:49:19 -07:00 committed by GitHub
parent ce250bc09e
commit cfa659905f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
src/common
training_mod_consts/src

View file

@ -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(),

View file

@ -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,
};

View file

@ -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",