diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0a1100b..83f708d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -60,7 +60,7 @@ jobs: cargo-skyline skyline update-std - name: Build release NRO id: build_release - run: RUSTFLAGS=-g cargo-skyline skyline build --release + run: RUSTFLAGS=-g cargo-skyline skyline build --release --features layout_arc_from_file - name: Upload plugin artifact uses: actions/upload-artifact@v3 with: diff --git a/src/static/layout.arc b/src/static/layout.arc index ab05c96..75611c4 100644 Binary files a/src/static/layout.arc and b/src/static/layout.arc differ diff --git a/src/training/input_log.rs b/src/training/input_log.rs index f21baf2..1d089d1 100644 --- a/src/training/input_log.rs +++ b/src/training/input_log.rs @@ -181,7 +181,7 @@ impl InputLog { .filter_map(|button| { Some(match *button { Buttons::ATTACK | Buttons::ATTACK_RAW => ("a", GREEN), - Buttons::SPECIAL | Buttons::SPECIAL_RAW | Buttons::SPECIAL_RAW2 => ("b", RED), + Buttons::SPECIAL | Buttons::SPECIAL_RAW2 => ("b", RED), Buttons::JUMP => ("x", CYAN), Buttons::GUARD | Buttons::GUARD_HOLD => ("lb", BLUE), Buttons::CATCH => ("zr", PURPLE), @@ -230,6 +230,18 @@ impl InputLog { if buttons.minus() { icons.push_front(("minus", WHITE)); } + if buttons.dpad_up() { + icons.push_front(("dpad_up", WHITE)); + } + if buttons.dpad_down() { + icons.push_front(("dpad_down", WHITE)); + } + if buttons.dpad_left() { + icons.push_front(("dpad_left", WHITE)); + } + if buttons.dpad_right() { + icons.push_front(("dpad_right", WHITE)); + } icons } diff --git a/src/training/ui/input_log.rs b/src/training/ui/input_log.rs index 374b5fc..0f209d8 100644 --- a/src/training/ui/input_log.rs +++ b/src/training/ui/input_log.rs @@ -120,6 +120,19 @@ unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) { "l_stick", "r_stick", "gcc_c_stick", + "dpad_up", + "dpad_down", + "dpad_left", + "dpad_right", + "dpad_left_right", + "up_strong", + "down_strong", + "left_strong", + "right_strong", + "up_left_strong", + "down_left_strong", + "up_right_strong", + "down_right_strong", ]; for idx in 0..NUM_ICON_SLOTS {