Skip to content

Scroll instruments list with Y+D-pad #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
prayerie wants to merge 1 commit into from
Closed

Scroll instruments list with Y+D-pad #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 37 additions & 5 deletions arm9/source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3460,12 +3460,19 @@ void move_to_top(void)
redraw_main_requested = true;
}

void move_inst_to_top(void)
{
handleInstChange(0);
lbinstruments->highlight(0);
lbinstruments->select(0);
}

// Update the state for certain keypresses
void handleButtons(u16 buttons, u16 buttonsheld)
{
u16 ptnlen = song->getPatternLength(song->getPotEntry(state->potpos));

if(!(buttonsheld & mykey_R))
if(!(buttonsheld & mykey_R) && !(buttonsheld & mykey_Y))
{
if(buttons & mykey_UP)
{
Expand Down Expand Up @@ -3501,8 +3508,30 @@ void handleButtons(u16 buttons, u16 buttonsheld)
state->setCursorRow(newrow);

pv->updateSelection();

redraw_main_requested = true;
}

}

if(!(buttonsheld & mykey_R) && (buttonsheld & mykey_Y))
{
int move_by = (buttonsheld & mykey_B) ? 4 : 1;
u16 cur_i = lbinstruments->getidx();
u16 new_i = cur_i;
if(buttons & mykey_DOWN) {
new_i = cur_i + move_by >= 0x7f ? 0x7f : cur_i + move_by;
lbinstruments->highlight(new_i);
lbinstruments->select(new_i);
handleInstChange(new_i);
}

if(buttons & mykey_UP) {
new_i = cur_i - move_by <= 0 ? 0 : cur_i - move_by;
lbinstruments->highlight(new_i);
lbinstruments->select(new_i);
handleInstChange(new_i);
}
}

if((buttons & mykey_LEFT)&&(!typewriter_active))
Expand Down Expand Up @@ -3585,10 +3614,13 @@ void VblankHandler(void)

if(keysheld & mykey_R)
{
if(keysheld & mykey_DOWN)
move_to_bottom();
else if(keysheld & mykey_UP)
move_to_top();
if(!(keysheld & mykey_Y)) {
if(keysheld & mykey_DOWN)
move_to_bottom();
else if(keysheld & mykey_UP)
move_to_top();
} else if (keysheld & mykey_UP)
move_inst_to_top();
}

if(keysdown & ~KEY_TOUCH)
Expand Down
2 changes: 1 addition & 1 deletion dsmi
Open in desktop
Submodule dsmi updated from d1ef41 to 602691
2 changes: 1 addition & 1 deletion libntxm
Open in desktop
Submodule libntxm updated from 71c75b to c93248