mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-10 22:41:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_lyt_meter_rupy OK

Browse Source
This commit is contained in:
robojumper
2025-04-15 00:09:46 +02:00
parent cd3556c433
commit 3403907ba6
4 changed files with 60 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/lyt/meter/d_lyt_meter_rupy.cpp
+16 -16
View File
@@ -407,7 +407,6 @@ void dLytMeterRupy_c::setDigit(s32 index, s32 digit) {
}
bool dLytMeterRupy_c::updateDisplayedAmount(bool suppressSound) {
// NONMATCHING - regswaps
s32 amount = getRupeeCounter2();
if (amount > 9999) {
amount = 9999;
@@ -419,10 +418,10 @@ bool dLytMeterRupy_c::updateDisplayedAmount(bool suppressSound) {
if (amount != mDisplayedRupeeCount || suppressSound) {
bool b = false;
if (amount < mDisplayedRupeeCount) {
if (mDisplayedRupeeCount - amount >= dLytMeterConfiguration_c::GetInstance()->field_0x1DC) {
newNumDisplayed = mDisplayedRupeeCount - dLytMeterConfiguration_c::GetInstance()->field_0x1E4;
} else if (mDisplayedRupeeCount - amount >= dLytMeterConfiguration_c::GetInstance()->field_0x1D8) {
newNumDisplayed = mDisplayedRupeeCount - dLytMeterConfiguration_c::GetInstance()->field_0x1E0;
if (mDisplayedRupeeCount - amount >= dLytMeterConfiguration_c::sInstance->getField_0x1DC()) {
newNumDisplayed = mDisplayedRupeeCount - dLytMeterConfiguration_c::sInstance->getField_0x1E4();
} else if (mDisplayedRupeeCount - amount >= dLytMeterConfiguration_c::sInstance->getField_0x1D8()) {
newNumDisplayed = mDisplayedRupeeCount - dLytMeterConfiguration_c::sInstance->getField_0x1E0();
} else {
newNumDisplayed = mDisplayedRupeeCount - 1;
}
@@ -438,10 +437,10 @@ bool dLytMeterRupy_c::updateDisplayedAmount(bool suppressSound) {
field_0x8AD = 0;
}
} else if (amount > mDisplayedRupeeCount) {
if (amount - mDisplayedRupeeCount >= dLytMeterConfiguration_c::GetInstance()->field_0x1DC) {
newNumDisplayed = mDisplayedRupeeCount + dLytMeterConfiguration_c::GetInstance()->field_0x1E4;
} else if (amount - mDisplayedRupeeCount >= dLytMeterConfiguration_c::GetInstance()->field_0x1D8) {
newNumDisplayed = mDisplayedRupeeCount + dLytMeterConfiguration_c::GetInstance()->field_0x1E0;
if (amount - mDisplayedRupeeCount >= dLytMeterConfiguration_c::sInstance->getField_0x1DC()) {
newNumDisplayed = mDisplayedRupeeCount + dLytMeterConfiguration_c::sInstance->getField_0x1E4();
} else if (amount - mDisplayedRupeeCount >= dLytMeterConfiguration_c::sInstance->getField_0x1D8()) {
newNumDisplayed = mDisplayedRupeeCount + dLytMeterConfiguration_c::sInstance->getField_0x1E0();
} else {
newNumDisplayed = mDisplayedRupeeCount + 1;
}
@@ -464,20 +463,21 @@ bool dLytMeterRupy_c::updateDisplayedAmount(bool suppressSound) {
newNumDisplayed = 0;
}
// The primary problem appear to be the lines marked with "// x".
s32 newNumDigits = 0;
if (newNumDisplayed >= 1000) {
newNumDigits = 4;
setDigit(0, newNumDisplayed / 1000);
setDigit(1, (newNumDisplayed % 1000) / 100); // x
setDigit(2, (newNumDisplayed % 100) / 10); // x
setDigit(3, newNumDisplayed % 10);
s32 rem = (newNumDisplayed % 1000);
setDigit(1, rem / 100);
rem = rem % 100;
setDigit(2, rem / 10);
setDigit(3, rem % 10);
} else if (newNumDisplayed >= 100) {
newNumDigits = 3;
setDigit(0, newNumDisplayed / 100);
setDigit(1, (newNumDisplayed % 100) / 10); // x
setDigit(2, newNumDisplayed % 10);
s32 rem = (newNumDisplayed % 100);
setDigit(1, rem / 10); // x
setDigit(2, rem % 10);
} else if (newNumDisplayed >= 10) {
newNumDigits = 2;
setDigit(0, newNumDisplayed / 10);