Skip to content

Wood: optional battery icon on the top screen #2703

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

Merged
RocketRobz merged 1 commit into from
Oct 27, 2026
Merged

Wood: optional battery icon on the top screen #2703

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
101 changes: 97 additions & 4 deletions romsel_aktheme/arm9/source/graphics/graphics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ static int freeSpaceY = 0;
static int freeSpaceW = 255;
static int freeSpaceH = 14;
static std::string freeSpaceLabel[2];
static u16* batteryIcons[2] = {NULL};
static int batteryIconsW = 0;
static int batteryIconsH = 0;
static int batteryX = 236;
static int batteryY = 2;

u16* colorTable = NULL;

Expand Down Expand Up @@ -1000,6 +1005,53 @@ void refreshFreeSpace(void) {
loadedFreeSpaceDevice = -1;
}

static int loadedBattery = -1;
static int pendingBattery = -1;
static u32 pendingBatterySince = 0;
static volatile u32 vblankCount = 0; // Counted in vBlankHandler

ITCM_CODE void drawBattery(void) {
if (!batteryIcons[0]) return;

// Frames 0-3 are 1-4 bars, 4-7 the same while charging (bit 7)
const int status = sys().batteryStatus();
const int level = status & 0xF;
const int frame = (level >= 0xF ? 3 : level >= 0xB ? 2 : level >= 0x7 ? 1 : 0) + ((status & BIT(7)) ? 4 : 0);

if (frame == loadedBattery) {
pendingBattery = -1;
return;
}

// A single odd reading would make the icon blink, so a new frame has to hold for 1 second (60 frames) first
if (loadedBattery >= 0) {
if (frame != pendingBattery) {
pendingBattery = frame;
pendingBatterySince = vblankCount;
}
if (vblankCount - pendingBatterySince < 60)
return;
}

pendingBattery = -1;
loadedBattery = frame;

int src = (batteryIconsW * batteryIconsH) * frame;

for (int y2 = batteryY; y2 < batteryY+batteryIconsH; y2++) {
for (int x2 = batteryX; x2 < batteryX+batteryIconsW; x2++) {
if (batteryIcons[0][src] == (0 | BIT(15))) {
topImageWithText[0][(y2*256)+x2] = topImage[0][(y2*256)+x2];
topImageWithText[1][(y2*256)+x2] = topImage[1][(y2*256)+x2];
} else {
topImageWithText[0][(y2*256)+x2] = batteryIcons[0][src];
topImageWithText[1][(y2*256)+x2] = batteryIcons[1][src];
}
src++;
}
}
}

enum class ImageType {
bottom,
top,
Expand All @@ -1018,7 +1070,8 @@ enum class ImageType {
weekdayText,
weekdayText2,
selectionBarBg,
boxArt
boxArt,
batteryIcons
};

static void loadBmp(const ImageType type, const char* filename) {
Expand All @@ -1036,6 +1089,15 @@ static void loadBmp(const ImageType type, const char* filename) {
fclose(file);
return;
}
if (type == ImageType::batteryIcons) {
// Frame sheet: a top-down BMP (negative height) or a bit depth drawn below would leave it unfilled
fseek(file, 0x1C, SEEK_SET);
const u8 bpp = fgetc(file);
if (height > 192*8 || (bpp != 1 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32)) {
fclose(file);
return;
}
}

int xPos = 0;
if (type < ImageType::startButton && width <= 254) {
Expand Down Expand Up @@ -1146,6 +1208,12 @@ static void loadBmp(const ImageType type, const char* filename) {
} else if (type == ImageType::boxArt) {
boxArtW = (int)width;
boxArtH = (int)height;
} else if (type == ImageType::batteryIcons) {
batteryIconsW = (int)width;
batteryIconsH = (int)height/8;

batteryIcons[0] = new u16[width*height];
batteryIcons[1] = new u16[width*height];
}

fseek(file, 0x1C, SEEK_SET);
Expand Down Expand Up @@ -1193,7 +1261,9 @@ static void loadBmp(const ImageType type, const char* filename) {
if (colorTable && ((type < ImageType::startButton) || (color != (0 | BIT(15))))) {
color = colorTable[color % 0x8000] | BIT(15);
}
if (type == ImageType::boxArt) {
if (type == ImageType::batteryIcons) {
batteryIcons[b][(y*width)+x] = color;
} else if (type == ImageType::boxArt) {
boxArt[b][(y*width)+x] = color;
} else if (type == ImageType::selectionBarBg) {
selectionBarBg[b][(y*width)+x] = color;
Expand Down Expand Up @@ -1314,6 +1384,10 @@ static void loadBmp(const ImageType type, const char* filename) {
renderWidth = (int)width;
dst = (boxArt[0] + (height-1) * width);
dst2 = (boxArt[1] + (height-1) * width);
} else if (type == ImageType::batteryIcons) {
renderWidth = (int)width;
dst = (batteryIcons[0] + (height-1) * width);
dst2 = (batteryIcons[1] + (height-1) * width);
}
u16 *src = bmpImageBuffer;
for (uint y = 0; y < height; y++, dst -= renderWidth, dst2 -= renderWidth) {
Expand Down Expand Up @@ -1358,7 +1432,10 @@ static void loadBmp(const ImageType type, const char* filename) {
int y = height-1;
for (u32 i = 0; i < width*height; i++) {
const u16 color = pixelBuffer[bmpImageBuffer[i]];
if (type == ImageType::boxArt) {
if (type == ImageType::batteryIcons) {
batteryIcons[0][(y*width)+x] = color;
batteryIcons[1][(y*width)+x] = color;
} else if (type == ImageType::boxArt) {
boxArt[0][(y*width)+x] = color;
boxArt[1][(y*width)+x] = color;
} else if (type == ImageType::selectionBarBg) {
Expand Down Expand Up @@ -1445,7 +1522,10 @@ static void loadBmp(const ImageType type, const char* filename) {
for (u32 i = 0; i < (width*height)/8; i++) {
for (int b = 7; b >= 0; b--) {
const u16 color = monoPixel[(bmpImageBuffer[i] & (BIT(b))) ? 1 : 0];
if (type == ImageType::boxArt) {
if (type == ImageType::batteryIcons) {
batteryIcons[0][(y*width)+x] = color;
batteryIcons[1][(y*width)+x] = color;
} else if (type == ImageType::boxArt) {
boxArt[0][(y*width)+x] = color;
boxArt[1][(y*width)+x] = color;
} else if (type == ImageType::selectionBarBg) {
Expand Down Expand Up @@ -1680,6 +1760,8 @@ void updateBoxArt(const char* filename, const char* tid) {

void vBlankHandler()
{
vblankCount++;

if (fadeType) {
screenBrightness--;
if (screenBrightness < 0) screenBrightness = 0;
Expand Down Expand Up @@ -2241,6 +2323,17 @@ void graphicsLoad()
showFreeSpace = (freeSpaceX >= 0 && freeSpaceY >= 0 && freeSpaceW > 0 && freeSpaceH > 0 && freeSpaceX+freeSpaceW < 256 && freeSpaceY+freeSpaceH < 192);
}

// Not "[battery icon]": the old akmenu used that name for a bottom-screen icon from other files
if (!ms().macroMode && ini.GetInt("battery", "show", 0)) {
batteryX = ini.GetInt("battery", "x", batteryX);
batteryY = ini.GetInt("battery", "y", batteryY);

loadBmp(ImageType::batteryIcons, (themePath + "/battery.bmp").c_str());
if (batteryX < 0 || batteryY < 0 || batteryX+batteryIconsW > 256 || batteryY+batteryIconsH > 192) {
batteryIconsW = 0; // Off screen, so draw nothing
}
}

if (!ms().macroMode && ms().showBoxArt && ini.GetInt("box art", "show", 0)) {
boxArtX = ini.GetInt("box art", "x", boxArtX);
boxArtY = ini.GetInt("box art", "y", boxArtY);
Expand Down
1 change: 1 addition & 0 deletions romsel_aktheme/arm9/source/graphics/graphics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ void drawDay(void);
void drawWeekday(void);
void drawFreeSpace(void);
void refreshFreeSpace(void);
void drawBattery(void);
void updateBoxArt(const char* filename, const char* tid);

void graphicsInit();
Expand Down
1 change: 1 addition & 0 deletions romsel_aktheme/arm9/source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,7 @@ void bgOperations(bool waitFrame) {
drawDay();
drawWeekday();
drawFreeSpace();
drawBattery();
if (waitFrame) {
swiWaitForVBlank();
}
Expand Down
Loading