From 8b01f15ff5d95212fe8459c4ef7ab19bf6656324 Mon Sep 17 00:00:00 2001 From: Dave Bernazzani Date: Sat, 17 May 2025 06:24:11 -0400 Subject: [PATCH] Version 6.1a with corrections for FASTLOAD key bindings. --- Makefile | 2 +- NINTV-DS.nds | Bin 758784 -> 759296 bytes arm9/source/config.cpp | 24 +++++++++++++----------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index d71bc66..0b16ffd 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ include $(DEVKITARM)/ds_rules export TARGET := NINTV-DS export TOPDIR := $(CURDIR) -export VERSION := 6.1 +export VERSION := 6.1a ICON := -b $(CURDIR)/logo.bmp "NINTV-DS $(VERSION);wavemotion-dave;https://github.com/wavemotion-dave/NINTV-DS" diff --git a/NINTV-DS.nds b/NINTV-DS.nds index 9956814050b2ba27dda79aea27413080e9299523..cac34f609117aa11c5073ed59571950f9f4231bd 100644 GIT binary patch delta 18791 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 diff --git a/arm9/source/config.cpp b/arm9/source/config.cpp index 0e7fbdc..9ba7d19 100644 --- a/arm9/source/config.cpp +++ b/arm9/source/config.cpp @@ -475,26 +475,28 @@ void FindAndLoadConfig(UINT32 crc) struct options_t { const char *label; - const char *option[30]; + const char *option[31]; UINT8 *option_val; UINT8 option_max; }; -#define KEY_MAP_OPTIONS "KEY-1", "KEY-2", "KEY-3", "KEY-4", "KEY-5", "KEY-6", "KEY-7", "KEY-8", "KEY-9", "KEY-CLR", "KEY-0", "KEY-ENT", "FIRE", "L-ACT", "R-ACT", "RESET", "LOAD", "CONFIG", "SCORES", "QUIT", "STATE", "MENU", "SWITCH L/R", "MANUAL", "SHOW DISC", "SHOW KBD", "DISC UP", "DISC DOWN", "SPEEDUP", "FASTLOAD SLOT 1" +#define KEY_MAP_OPTIONS "KEY-1", "KEY-2", "KEY-3", "KEY-4", "KEY-5", "KEY-6", "KEY-7", "KEY-8", "KEY-9", "KEY-CLR", "KEY-0",\ + "KEY-ENT", "FIRE", "L-ACT", "R-ACT", "RESET", "LOAD", "CONFIG", "SCORES", "QUIT", "STATE",\ + "MENU", "SWITCH L/R", "MANUAL", "SHOW DISC", "SHOW KBD", "SWAP OVL", "DISC UP", "DISC DOWN", "SPEEDUP", "FASTLOAD SLOT 1" const struct options_t Option_Table[3][20] = { // Page 1 options { - {"A BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_A_map, 30}, - {"B BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_B_map, 30}, - {"X BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_X_map, 30}, - {"Y BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_Y_map, 30}, - {"L BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_L_map, 30}, - {"R BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_R_map, 30}, - {"START BTN", {KEY_MAP_OPTIONS}, &myConfig.key_START_map, 30}, - {"SELECT BTN", {KEY_MAP_OPTIONS}, &myConfig.key_SELECT_map, 30}, - {"A+X BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_AX_map, 26}, // These can't be mapped to SPEEDUP, SHOW DISK or SHOW KEYBOARD so the array here is one shorter + {"A BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_A_map, 31}, + {"B BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_B_map, 31}, + {"X BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_X_map, 31}, + {"Y BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_Y_map, 31}, + {"L BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_L_map, 31}, + {"R BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_R_map, 31}, + {"START BTN", {KEY_MAP_OPTIONS}, &myConfig.key_START_map, 31}, + {"SELECT BTN", {KEY_MAP_OPTIONS}, &myConfig.key_SELECT_map, 31}, + {"A+X BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_AX_map, 26}, // These can't be mapped to DISC UP/DN or later meta keys {"X+Y BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_XY_map, 26}, {"Y+B BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_YB_map, 26}, {"B+A BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_BA_map, 26},