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

Remove fakematch for KinstoneMenu_080A4494 using DWORD (#694) 

* Remove fakematch for KinstoneMenu_080A4494 using DWORD

* Fix fint
This commit is contained in:
KEKW555 2024-02-17 11:04:02 +05:30 committed by GitHub
parent 8170c03e7e
commit cd2b8d4b53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/menu/kinstoneMenu.c
View File

@ -629,8 +629,10 @@ void KinstoneMenu_080A4468(void) {
u32 KinstoneMenu_080A4494(void) { u32 KinstoneMenu_080A4494(void) {
WStruct* psVar1; WStruct* psVar1;
u8* r1;
u32 ret; u32 ret;
union SplitDWord multiVal;
// TODO: Change this to union of u8* and u32
u8* fuserTextId;
psVar1 = sub_0805F2C8(); psVar1 = sub_0805F2C8();
if (psVar1 != NULL) { if (psVar1 != NULL) {
@ -639,13 +641,9 @@ u32 KinstoneMenu_080A4494(void) {
psVar1->bgColor = 5; psVar1->bgColor = 5;
psVar1->unk1 = 0; psVar1->unk1 = 0;
sub_080A44E0(psVar1, gSave.name, 0x80); sub_080A44E0(psVar1, gSave.name, 0x80);
#if NON_MATCHING multiVal = GetFuserIdAndFuserTextId(gFuseInfo.entity);
ret = sub_080A44E0(psVar1, GetFuserId(gFuseInfo.entity) >> 0x20, 0xa0); fuserTextId = (u8*)multiVal.HALF_U.HI;
#else ret = sub_080A44E0(psVar1, fuserTextId, 0xa0);
GetFuserId(gFuseInfo.entity);
asm("" : "=r"(r1));
ret = sub_080A44E0(psVar1, r1, 0xa0);
#endif
sub_0805F300(psVar1); sub_0805F300(psVar1);
} }
return ret; return ret;