mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-04 02:29:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match SortKinstoneBag

Browse Source 
extract kinstone related data from SaveFile into it's own struct

Co-authored-by: KEKW555 <152369890+KEKW555@users.noreply.github.com>
This commit is contained in:
Henny022p
2023-12-24 04:54:59 +01:00
parent 040b1f3a59
commit 1944bf5e6d
14 changed files with 76 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menu/kinstoneMenu.c
+7 -7
View File
@@ -86,7 +86,7 @@ const ScreenTransitionData gUnk_08128024[] = {
u32 sub_080A3B48(void) {
u32 index;
for (index = 0; index <= 0x12; index++) {
if (gSave.kinstoneAmounts[index] == 0) {
if (gSave.kinstones.amounts[index] == 0) {
break;
}
}
@@ -206,7 +206,7 @@ void KinstoneMenu_Type1(void) {
case A_BUTTON:
if (gMenu.column_idx == 2) {
tmp3 = gGenericMenu.unk10.i / 0x10000;
gGenericMenu.unk2a = gSave.kinstoneTypes[tmp3];
gGenericMenu.unk2a = gSave.kinstones.types[tmp3];
SetMenuType(3);
}
break;
@@ -319,9 +319,9 @@ void KinstoneMenu_Type5(void) {
void KinstoneMenu_Type5_Overlay0(void) {
gMenu.column_idx = 5;
WriteBit(gSave.fusedKinstones, gFuseInfo.kinstoneId);
if (++gSave.fusedKinstoneCount > 99) {
gSave.didAllFusions = 1;
WriteBit(gSave.kinstones.fusedKinstones, gFuseInfo.kinstoneId);
if (++gSave.kinstones.fusedCount > 99) {
gSave.kinstones.didAllFusions = 1;
}
KinstoneMenu_080A4468();
SoundReq(SFX_TASK_COMPLETE);
@@ -462,7 +462,7 @@ void KinstoneMenu_080A414C(void) {
OamCmd->x = ((ptr[((uVar1 & tmp1) + 0x40) & tmp1] * 0x42) / 0x100) - 0x10;
iVar2 = gKinstoneMenu.unk10.WORD / 0x10000 + i;
if (iVar2 >= 0) {
uVar3 = gSave.kinstoneAmounts[iVar2];
uVar3 = gSave.kinstones.amounts[iVar2];
if (i == 0) {
switch (gMenu.column_idx) {
case 3:
@@ -474,7 +474,7 @@ void KinstoneMenu_080A414C(void) {
}
}
if (uVar3 > 0) {
sub_080A42E0(gSave.kinstoneTypes[iVar2], uVar3);
sub_080A42E0(gSave.kinstones.types[iVar2], uVar3);
}
}
uVar1 += 0x17;
src/menu/pauseMenu.c
+4 -4
View File
@@ -666,7 +666,7 @@ void sub_080A5594(void) {
iVar5 = 0;
if (GetInventoryValue(ITEM_KINSTONE_BAG) != 0) {
for (i = 0; i < 0x13; i++) {
iVar5 += gSave.kinstoneAmounts[i];
iVar5 += gSave.kinstones.amounts[i];
}
if (iVar5 >= 0x50) {
@@ -1305,11 +1305,11 @@ void sub_080A6044(void) {
gOamCmd._6 = 0;
uVar4 = 0;
uVar2 = 0;
uVar1 = gSave.kinstoneTypes[0];
uVar1 = gSave.kinstones.types[0];
while (uVar1 != 0) {
gOamCmd.x = (uVar4 & 3) * 0x30 + 0x2b;
gOamCmd.y = (uVar4 >> 2) * 0x24 + 0x34;
uVar3 = gSave.kinstoneAmounts[uVar2];
uVar3 = gSave.kinstones.amounts[uVar2];
gMenu.column_idx = 0;
sub_080A42E0(uVar1, uVar3);
uVar4++;
@@ -1320,7 +1320,7 @@ void sub_080A6044(void) {
if (0x11 < uVar2) {
return;
}
uVar1 = gSave.kinstoneTypes[uVar2];
uVar1 = gSave.kinstones.types[uVar2];
}
}
}