diff --git a/include/save.h b/include/save.h index 5fe9c04b..4d5e6d06 100644 --- a/include/save.h +++ b/include/save.h @@ -60,8 +60,8 @@ typedef struct { /*0x117*/ u8 fusedKinstoneCount; /*0x118*/ u8 unk118[0x13]; // TODO also related to kinstones /*0x12B*/ u8 unk12B[0x16]; // TODO also related to kinstones - /*0x141*/ u8 unk141[128]; // TODO sub_08064F28 and also the goddesses, indexed by sub_08002632 - /*0x1C1*/ u8 unk1C1[128]; // TODO also related to kinstones, see sub_0801E6C8 0x80 available kinstone fusions? + /*0x141*/ u8 fuserProgress[128]; // indexed by fuser id, incremented after fusion + /*0x1C1*/ u8 fuserOffers[128]; // available kinstone fusion for each fuser /*0x241*/ u8 fusedKinstones[13]; /**< Bitfield for fused kinstones. @see CheckKinstoneFused */ /*0x24E*/ u8 unk24E[14]; // TODO something else with kinstones @see sub_0801E810 /*0x25C*/ u8 flags[0x200]; /**< Flags. */ diff --git a/src/common.c b/src/common.c index 909dd944..f92ea874 100644 --- a/src/common.c +++ b/src/common.c @@ -751,13 +751,13 @@ void sub_0801E6C8(u32 kinstoneId) { u32 index; if (kinstoneId - 1 < 100) { for (index = 0; index < 0x80; index++) { - if (kinstoneId == gSave.unk1C1[index]) { - gSave.unk1C1[index] = 0xf1; + if (kinstoneId == gSave.fuserOffers[index]) { + gSave.fuserOffers[index] = 0xf1; } } tmp = sub_08002632(gFuseInfo.ent); - if ((tmp - 1 < 0x7f) && (gSave.unk1C1[tmp] == 0xf1)) { - gSave.unk1C1[tmp] = 0xf2; + if ((tmp - 1 < 0x7f) && (gSave.fuserOffers[tmp] == 0xf1)) { + gSave.fuserOffers[tmp] = 0xf2; } for (index = 0; index < 0x20; index++) { if (kinstoneId == gUnk_03003DF0.array[index].unk_3) { @@ -982,8 +982,8 @@ u32 sub_0801E99C(Entity* entity) { if (GetInventoryValue(ITEM_KINSTONE_BAG) == 0 || fuserData[0] > gSave.global_progress) { return 0; } - offeredFusion = gSave.unk1C1[fuserId]; - fuserProgress = gSave.unk141[fuserId]; + offeredFusion = gSave.fuserOffers[fuserId]; + fuserProgress = gSave.fuserProgress[fuserId]; fuserFusionData = (u8*)(fuserProgress + (u32)fuserData); while (TRUE) { // loop through fusions for this fuser switch (offeredFusion) { @@ -1013,8 +1013,8 @@ u32 sub_0801E99C(Entity* entity) { } offeredFusion = 0xF1; // already completed, try next fusion in the list } - gSave.unk1C1[fuserId] = offeredFusion; - gSave.unk141[fuserId] = fuserProgress; + gSave.fuserOffers[fuserId] = offeredFusion; + gSave.fuserProgress[fuserId] = fuserProgress; randomMood = Random(); fuserStability = fuserData[1]; if (fuserStability <= randomMood % 100) { diff --git a/src/npc/cucco.c b/src/npc/cucco.c index c79084a8..9944978e 100644 --- a/src/npc/cucco.c +++ b/src/npc/cucco.c @@ -113,7 +113,7 @@ void sub_0806E65C(Entity* this) { void Cucco_ShowMessage(Entity* this) { u32 val = 0; u32 index = sub_08002632(this); - if (gSave.unk1C1[index] == 0xf3) { + if (gSave.fuserOffers[index] == 0xf3) { val = 1; } diff --git a/src/npc/din.c b/src/npc/din.c index 894edab4..19f23540 100644 --- a/src/npc/din.c +++ b/src/npc/din.c @@ -31,7 +31,7 @@ void Din(Entity* this) { void sub_08064828(Entity* this) { u32 tmp = sub_0801E99C(this); - if ((gSave.unk141[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) { + if ((gSave.fuserProgress[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) { tmp = 0; } sub_08078784(this, tmp); diff --git a/src/npc/farore.c b/src/npc/farore.c index 32f6e6ee..cbd09a5a 100644 --- a/src/npc/farore.c +++ b/src/npc/farore.c @@ -31,7 +31,7 @@ void Farore(Entity* this) { void sub_08064A28(Entity* this) { u32 tmp = sub_0801E99C(this); - if ((gSave.unk141[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) { + if ((gSave.fuserProgress[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) { tmp = 0; } sub_08078784(this, tmp); diff --git a/src/npc/nayru.c b/src/npc/nayru.c index 262b251c..23ab5de6 100644 --- a/src/npc/nayru.c +++ b/src/npc/nayru.c @@ -31,7 +31,7 @@ void Nayru(Entity* this) { void sub_08064928(Entity* this) { u32 tmp = sub_0801E99C(this); - if ((gSave.unk141[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) { + if ((gSave.fuserProgress[sub_08002632(this)] != 0) && (gSave.global_progress < 7)) { tmp = 0; } sub_08078784(this, tmp); diff --git a/src/npc/tingleSiblings.c b/src/npc/tingleSiblings.c index 7ca9c778..36819425 100644 --- a/src/npc/tingleSiblings.c +++ b/src/npc/tingleSiblings.c @@ -134,7 +134,7 @@ void sub_08064F28(Entity* this, ScriptExecutionContext* context) { context->condition = 0; roomFlag = gUnk_0810FC50[this->type]; if (CheckRoomFlag(roomFlag) == 0) { - bVar2 = gSave.unk141[sub_08002632(this)]; + bVar2 = gSave.fuserProgress[sub_08002632(this)]; if (bVar2 >= 2) { uVar5 = 3; } else { diff --git a/src/npcUtils.c b/src/npcUtils.c index 190c9338..c66537f3 100644 --- a/src/npcUtils.c +++ b/src/npcUtils.c @@ -355,7 +355,7 @@ u32 UpdateFuseInteraction(Entity* ent) { void sub_0806F188(Entity* ent) { u32 idx = sub_08002632(ent); if (idx != 0) - gSave.unk1C1[idx] = 0xF3; + gSave.fuserOffers[idx] = 0xF3; } void ShowNPCDialogue(Entity* ent, const Dialog* dia) {