wavemotion-dave/NINTV-DS
1
Fork 0
mirror of https://github.com/wavemotion-dave/NINTV-DS.git synced 2025-06-18 13:55:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version 5.9a with a new FASTLOAD option to restore a game saved to Slot 1. New overlays for Death Star Strike and an improved Baseball overlay.

Browse Source
This commit is contained in:
Dave Bernazzani 2024-11-02 06:49:04 -04:00
parent 19ea551c95
commit 2defab52e8
8 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@ include $(DEVKITARM)/ds_rules
export TARGET := NINTV-DS
export TOPDIR := $(CURDIR)
export VERSION := 5.9
export VERSION := 5.9a
ICON := -b $(CURDIR)/logo.bmp "NINTV-DS $(VERSION);wavemotion-dave;https://github.com/wavemotion-dave/NINTV-DS"

BIN
NINTV-DS.nds
View File

Binary file not shown.

24
arm9/source/config.cpp
View File

@ -471,25 +471,25 @@ void FindAndLoadConfig(UINT32 crc)
struct options_t
{
const char *label;
const char *option[29];
const char *option[30];
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", "MANUAL", "SHOW DISC", "SHOW KBD", "DISC UP", "DISC DOWN", "SPEEDUP"
#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", "MANUAL", "SHOW DISC", "SHOW KBD", "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, 29},
{"B BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_B_map, 29},
{"X BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_X_map, 29},
{"Y BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_Y_map, 29},
{"L BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_L_map, 29},
{"R BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_R_map, 29},
{"START BTN", {KEY_MAP_OPTIONS}, &myConfig.key_START_map, 29},
{"SELECT BTN", {KEY_MAP_OPTIONS}, &myConfig.key_SELECT_map, 29},
{"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
{"X+Y BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_XY_map, 26},
{"Y+B BUTTON", {KEY_MAP_OPTIONS}, &myConfig.key_YB_map, 26},
@ -522,8 +522,8 @@ const struct options_t Option_Table[3][20] =
{"OVL DIR", {"SAME AS ROMS", "/ROMS/OVL", "/ROMS/INTV/OVL", "/DATA/OVL"}, &myGlobalConfig.ovl_dir, 4},
{"ROM DIR", {"SAME AS EMU", "/ROMS", "/ROMS/INTV"}, &myGlobalConfig.rom_dir, 3},
{"MAN DIR", {"SAME AS ROMS", "/ROMS/MAN", "/ROMS/INTV/MAN", "/DATA/MAN"}, &myGlobalConfig.man_dir, 4},
{"START DEF", {KEY_MAP_OPTIONS}, &myGlobalConfig.key_START_map_default, 29},
{"SELECT DEF", {KEY_MAP_OPTIONS}, &myGlobalConfig.key_SELECT_map_default, 29},
{"START DEF", {KEY_MAP_OPTIONS}, &myGlobalConfig.key_START_map_default, 30},
{"SELECT DEF", {KEY_MAP_OPTIONS}, &myGlobalConfig.key_SELECT_map_default, 30},
{"DEF SOUND", {"LOW", "MEDIUM", "HIGH"}, &myGlobalConfig.def_sound_quality, 3},
{"DEF PALETTE", {"ORIGINAL", "MUTED", "BRIGHT", "PAL", "CUSTOM"}, &myGlobalConfig.def_palette, 5},
{"DEF FRAMSKP", {"OFF", "ON (ODD)", "ON (EVEN)"}, &myGlobalConfig.frame_skip, 3},

7
arm9/source/nintv-ds.cpp
View File

@ -704,6 +704,13 @@ void ds_handle_meta(int meta_key)
bShowKeyboard ^= 1;
show_overlay(bShowKeyboard, bShowDisc);
break;
case OVL_META_FASTLOAD:
{
void quick_load(void);
quick_load();
}
break;
}
}

1
arm9/source/overlay.cpp
View File

@ -450,6 +450,7 @@ struct MapRomToOvl_t MapRomToOvl[] =
{0xFFFFFFFF , "KLAX", "KLAX", "Klax.ovl"},
{0xFFFFFFFF , "AARDVARK", "AARDVARK", "Aardvark.ovl"},
{0x51870e4a , "UPMONSTER", "UPMONSTER", "Upmonsters.ovl"},
{0x7fd5d202 , "DEATH", "STRIKE", "Death Star Strike.ovl"},
{0x00000000 , "xxx", "zzz", "generic.ovl"},
};

11
arm9/source/overlay.h
View File

@ -60,12 +60,13 @@ struct Overlay_t
#define OVL_META_DISC_UP 26
#define OVL_META_DISC_DN 27
#define OVL_META_SPEEDUP 28
#define OVL_META_STRETCH 29
#define OVL_META_GCONFIG 30
#define OVL_META_CHEATS 31
#define OVL_META_EMUINFO 32
#define OVL_META_FASTLOAD 29
#define OVL_META_STRETCH 30
#define OVL_META_GCONFIG 31
#define OVL_META_CHEATS 32
#define OVL_META_EMUINFO 33
#define OVL_MAX 33
#define OVL_MAX 34
#define DISC_MAX 16

7
arm9/source/savestate.cpp
View File

@ -327,6 +327,13 @@ void show_slot_info(UINT8 slot)
}
}
// Quick load from slot 1
void quick_load(void)
{
just_read_save_file();
state_restore(0);
}
// ------------------------------------------------------------------------
// Show the save/restore menu and let the user pick an option (or exit).
// ------------------------------------------------------------------------

BIN
extras.zip
View File

Binary file not shown.