RocketRobz/SuperAllStarPhotoStudio
1
Fork 0
mirror of https://github.com/RocketRobz/SuperAllStarPhotoStudio.git synced 2025-06-18 17:15:35 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

DS(i): Derp fix

Browse Source
This commit is contained in:
RocketRobz 2024-02-26 19:23:26 -07:00
parent 3e2dd30447
commit 4a03113c84
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nds/arm9/source/gfx.cpp
View File

@ -70,7 +70,7 @@ extern int bg3Sub;
extern u16* colorTable;
extern void applyColorLut(u16 *palette, int size);
extern void copyPalette(u16 *dst, const u16 *src, int size);
extern void copyPalette16(u16 *dst, const u16 *src, int size);
extern bool showCursor;
extern int cursorAlpha;
@ -281,7 +281,7 @@ void updateTitleScreen(const int metalXposBase) {
for (int i = 0; i < 256*192; i+=2) {
bgGetGfxPtr(bg3Sub)[i/2] += 0x1010; // Shift pallete 16 colors further
}
copyPalette(BG_PALETTE_SUB + 0x10, photo_bgPal, 240);
copyPalette16(BG_PALETTE_SUB + 0x10, photo_bgPal, 240);
titleBottomLoaded = true;
}
}

13
nds/arm9/source/gui.cpp
View File

@ -100,7 +100,7 @@ void applyColorLut(u16 *palette, int size) {
}
// Copies a palette and applies color LUT if loaded
void copyPalette(u16 *dst, const u16 *src, int size) {
void copyPalette16(u16 *dst, const u16 *src, int size) {
if (colorTable) {
for (int i = 0; i < size; i++) {
dst[i] = colorTable[src[i]];
@ -110,6 +110,17 @@ void copyPalette(u16 *dst, const u16 *src, int size) {
tonccpy(dst, src, size*sizeof(u16));
}
// Copies a palette and applies color LUT if loaded
void copyPalette(u16 *dst, const u16 *src, int size) {
if (colorTable) {
for (int i = 0; i < size/sizeof(u16); i++) {
dst[i] = colorTable[src[i]];
}
return;
}
tonccpy(dst, src, size);
}
// Initialize GUI.
void Gui::init(void) {
*(vu16*)0x0400006C |= BIT(14);