Skip to content

Commit b342f2d

Browse files
committed
Wood theme: Revert improved icon scroll speed to fix icon load bugs
1 parent 4bd12a1 commit b342f2d

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

romsel_aktheme/arm9/source/fileBrowse.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ void getGameInfo0(const int fileOffset, std::vector<DirEntry> dirContents) {
410410
}
411411
}
412412

413-
static bool scrollUpByOne = false;
414-
static bool scrollDownByOne = false;
413+
// static bool scrollUpByOne = false;
414+
// static bool scrollDownByOne = false;
415415

416416
void loadIcons(const int screenOffset, std::vector<DirEntry> dirContents) {
417417
clearText(false);
@@ -511,7 +511,7 @@ void loadIcons(const int screenOffset, std::vector<DirEntry> dirContents) {
511511
updateText(false);
512512
}
513513

514-
extern bool stopDSiAnim;
514+
/* extern bool stopDSiAnim;
515515
extern bool stopDSiAnimNotif;
516516
517517
void loadIconUp(const int screenOffset, std::vector<DirEntry> dirContents) {
@@ -734,7 +734,7 @@ void loadIconDown(const int screenOffset, std::vector<DirEntry> dirContents) {
734734
735735
updateText(false);
736736
scrollDownByOne = false;
737-
}
737+
} */
738738

739739
void refreshBanners(const int startRow, const int fileOffset, std::vector<DirEntry> dirContents) {
740740
clearText(false);
@@ -1625,23 +1625,23 @@ std::string browseForFile(const std::vector<std::string_view> extensionList) {
16251625
if (screenOffset > 0) {
16261626
screenOffset--;
16271627
cursorPosOnScreen = fileOffset - screenOffset;
1628-
scrollUpByOne = true;
1628+
// scrollUpByOne = true;
16291629
}
16301630
} else if (fileOffset - screenOffset > (0.5 * entriesPerScreen)) {
16311631
if (screenOffset + entriesPerScreen < file_count) {
16321632
screenOffset++;
16331633
cursorPosOnScreen = fileOffset - screenOffset;
1634-
scrollDownByOne = true;
1634+
// scrollDownByOne = true;
16351635
}
16361636
}
16371637
if (displayIcons && (screenOffsetPrev != screenOffset || listModeSwitched)) {
1638-
if (scrollUpByOne) {
1638+
/* if (scrollUpByOne) {
16391639
loadIconUp(screenOffset, dirContents);
16401640
} else if (scrollDownByOne) {
16411641
loadIconDown(screenOffset, dirContents);
1642-
} else {
1642+
} else { */
16431643
loadIcons(screenOffset, dirContents);
1644-
}
1644+
// }
16451645
} else {
16461646
refreshBanners(screenOffset, fileOffset, dirContents);
16471647
}

romsel_aktheme/arm9/source/graphics/graphics.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ int frameOf60fps = 60;
6868
int frameDelay = 0;
6969
bool frameDelayEven = true; // For 24FPS
7070
bool renderFrame = true;
71-
bool stopDSiAnim = false;
72-
bool stopDSiAnimNotif = false;
71+
// bool stopDSiAnim = false;
72+
// bool stopDSiAnimNotif = false;
7373

7474
extern int spawnedtitleboxes;
7575

@@ -1645,10 +1645,11 @@ void vBlankHandler()
16451645
}
16461646
// if (bnrWirelessIcon > 0) glSprite(24, 12, GL_FLIP_NONE, &wirelessIcons[(bnrWirelessIcon-1) & 31]);
16471647
// Playback animated icons
1648-
if (!stopDSiAnim && bnriconisDSi[i]) {
1648+
// if (!stopDSiAnim && bnriconisDSi[i]) {
1649+
if (bnriconisDSi[i]) {
16491650
playBannerSequence(i);
16501651
}
1651-
stopDSiAnimNotif = stopDSiAnim;
1652+
// stopDSiAnimNotif = stopDSiAnim;
16521653
}
16531654
if (iconScaleEnabled) {
16541655
if (!iconScaleDelay) {

0 commit comments

Comments
 (0)