falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup divRem in pauseMenu.c

This commit is contained in:
KEKW555 2024-01-22 03:03:56 +05:30 committed by GitHub
parent 8dd8b2b69a
commit e25d89035d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/menu/pauseMenu.c
View File

@ -1232,26 +1232,14 @@ bool32 sub_080A5F24(void) {
return result; return result;
} }
typedef union {
struct {
s32 v1;
s32 v2;
} values;
u64 raw;
} DoubleReturnValue;
void sub_080A5F48(Item item, u32 offset) { void sub_080A5F48(Item item, u32 offset) {
// this funcitons signature allows the div function to return a u64 (2x 32 bit registers)
// with the result in one register and the remainder in the other
typedef u64 DivRem(u32, u32);
s32 ammoCount; s32 ammoCount;
s32 onesDigit; s32 onesDigit;
s32 tensDigit; s32 tensDigit;
void* dest; void* dest;
u16* temp2; u16* temp2;
u32 index; u32 index;
DoubleReturnValue ret; union SplitDWord divRem;
switch (item) { switch (item) {
case ITEM_BOTTLE1: case ITEM_BOTTLE1:
@ -1281,9 +1269,9 @@ void sub_080A5F48(Item item, u32 offset) {
if (ammoCount < 0) if (ammoCount < 0)
return; return;
ret.raw = ((DivRem*)Div)(ammoCount, 10); // by casting to DivRem, we can recover the remainder from the Div call divRem = DivAndMod(ammoCount, 10);
onesDigit = ret.values.v2; onesDigit = divRem.HALF.HI;
tensDigit = ret.values.v1; tensDigit = divRem.HALF.LO;
if (tensDigit >= 10) if (tensDigit >= 10)
tensDigit = 9; tensDigit = 9;