Match SortKinstoneBag

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
+1 -1
View File
@@ -214,7 +214,7 @@ void CuccoMinigame_WinItem(CuccoMinigameEntity* this) {
}
break;
case ITEM_KINSTONE:
if (gSave.didAllFusions) {
if (gSave.kinstones.didAllFusions) {
skipItem = 1;
}
break;
+2 -2
View File
@@ -44,14 +44,14 @@ void Object37_Init(Object37Entity* this) {
void Object37_Action1(Object37Entity* this) {
Entity* item;
if ((gSave.fusionUnmarked[0] != 0) && (this->unk70 != *this->unk78)) {
if ((gSave.kinstones.fusionUnmarked[0] != 0) && (this->unk70 != *this->unk78)) {
item = CreateGroundItem(super, ITEM_RUPEE100, 0);
if (item != 0) {
item->direction = gPlayerEntity.animationState << 2;
item->speed = 0x80;
item->zVelocity = Q_16_16(2.0);
}
gSave.fusionUnmarked[0] = 1;
gSave.kinstones.fusionUnmarked[0] = 1;
DeleteThisEntity();
}
}