From ad78fff11618c968acb6a5c341f86c52c163f8dd Mon Sep 17 00:00:00 2001 From: RocketRobz Date: Thu, 9 Dec 2021 14:24:41 -0700 Subject: [PATCH] DSi-based themes: Derp fix --- .../arm9/source/graphics/ThemeTextures.cpp | 10 +--------- .../arm9/source/graphics/ThemeTextures.h | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.cpp b/romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.cpp index bb13ef2036..bd09787df5 100644 --- a/romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.cpp +++ b/romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.cpp @@ -1117,16 +1117,8 @@ ITCM_CODE int ThemeTextures::getVolumeLevel(void) { ITCM_CODE int ThemeTextures::getBatteryLevel(void) { u8 batteryLevel = sys().batteryStatus(); - if (!sys().isDSPhat() && (batteryLevel & BIT(7))) + if (batteryLevel & BIT(7)) return 7; - - if (!dsiFeatures()) { - if (batteryLevel & BIT(0)) - return 1; - return 0; - } - - // DSi Mode if (batteryLevel == 0xF) return 4; if (batteryLevel == 0xB) diff --git a/romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.h b/romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.h index cabe41218c..1e463d2602 100644 --- a/romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.h +++ b/romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.h @@ -196,6 +196,7 @@ class ThemeTextures case 7: return _batterychargeTexture.get(); case 4: + default: return _battery4Texture.get(); case 3: return _battery3Texture.get(); @@ -203,7 +204,6 @@ class ThemeTextures return _battery2Texture.get(); case 1: case 0: - default: return _battery1Texture.get(); case -1: return _battery0Texture.get(); @@ -215,9 +215,9 @@ class ThemeTextures return _batterychargeblinkTexture.get(); case 7: return _batterychargeTexture.get(); - case 1: default: return regularDS ? _batteryfullDSTexture.get() : _batteryfullTexture.get(); + case 1: case 0: return _batterylowTexture.get(); }