Skip to content

Commit

Permalink
NesDS v1.3c+
Browse files Browse the repository at this point in the history
Fixed some screen presets (All Scaled now properly scales the entire area), added a new lower default scale setting, reworded palette selection like "Wii NES VC"

by nibbles27, who has also done the changes in the three prior commits
  • Loading branch information
RocketRobz committed Sep 5, 2023
1 parent 3f47300 commit b6b5b30
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export LIBFAT := $(DEVKITARM)/libfat
export LIBFILESYSTEM := $(DEVKITARM)/libfilesystem

export GAME_TITLE := nesDS
export GAME_SUBTITLE1 := Version 1.3c
export GAME_SUBTITLE1 := Version 1.3c+
export GAME_SUBTITLE2 := Enjoy yourself!
export GAME_ICON := $(CURDIR)/icon.bmp
export TARGET := nesDS
Expand Down
16 changes: 11 additions & 5 deletions arm9/source/menu_func.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ char *brightxt[] = {
};

char *paltxt[] = {
"Loopys Orig","AsquireReal","ChrisCovell","CrashMan ","MattConte ","MESS Pal ","PasoFami/99","Quor's Pal ","FireBrandX ","FBXDigPrime","FBX NES PVM","NES VC ","NES Classic","3DS VC "
"Loopys Orig","AsquireReal","ChrisCovell","CrashMan ","MattConte ","MESS Pal ","PasoFami/99","Quor's Pal ","FireBrandX ","FBXDigiPrim","FBX NES PVM","Wii NES VC ","NES Classic","3DS NES VC "
};

void menu_display_start(void)
Expand Down Expand Up @@ -365,8 +365,8 @@ void menu_preset_func(void) {
rescale(ad_scale,ad_ypos);
}
else if(lastbutton_cnt == 5) {
ad_scale=0xd000;
ad_ypos=-0x00000000;
ad_scale=0xce00;
ad_ypos=-0x00010000;
rescale(ad_scale,ad_ypos);
}
else if(lastbutton_cnt == 6) {
Expand All @@ -383,6 +383,11 @@ void menu_preset_func(void) {
ad_scale=0xe000;
ad_ypos=-0x00060000;
rescale(ad_scale,ad_ypos);
}
else if(lastbutton_cnt == 9) {
ad_scale=0xe000;
ad_ypos=-0x000c0000;
rescale(ad_scale,ad_ypos);
} menu_stat = 3;
}

Expand All @@ -395,12 +400,13 @@ struct menu_item menu_preset_items[] = {
{.name = "All\r \rScaled", .type = 1, .x = 8, .y = 12, .w = 6, .h = 3, .func = menu_preset_func},
{.name = "Middle\rMedium\rScale", .type = 1, .x = 16, .y = 12, .w = 6, .h = 3, .func = menu_preset_func},
{.name = "Bottom\rMedium\rScale", .type = 1, .x = 24, .y = 12, .w = 6, .h = 3, .func = menu_preset_func},
{.name = "Default\r Scale", .type = 1, .x = 11, .y = 18, .w = 7, .h = 2, .func = menu_preset_func},
{.name = "Default\r Scale", .type = 1, .x = 7, .y = 18, .w = 7, .h = 2, .func = menu_preset_func},
{.name = "Default\r Lower", .type = 1, .x = 16, .y = 18, .w = 7, .h = 2, .func = menu_preset_func},
};

struct menu_unit menu_preset = {
.top = "Preset",
.subcnt = 9,
.subcnt = 10,
.item = menu_preset_items,
};

Expand Down

0 comments on commit b6b5b30

Please sign in to comment.