summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEblo <7004497+Eblo@users.noreply.github.com>2025-11-15 10:20:47 -0500
committerGitHub <noreply@github.com>2025-11-15 10:20:47 -0500
commit0e9c5abddad71db7e141e20281883ad3f38503a2 (patch)
tree3ccb4cbcaacf6f5b3ded7ccb199dcf602babebd2
parentf45acdd794712fefa0fae0bca86dcac22e040f09 (diff)
parent482e95f4e4ac0882a06e2556db92960462cbc14f (diff)
Merge pull request #1323 from Caladius/develop-mion-triforce-fix
Update Triforce from u8 to u16
-rw-r--r--mm/2s2h/Rando/DrawItem.cpp2
-rw-r--r--mm/include/z64save.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/mm/2s2h/Rando/DrawItem.cpp b/mm/2s2h/Rando/DrawItem.cpp
index 73e752e4f..fa96c72db 100644
--- a/mm/2s2h/Rando/DrawItem.cpp
+++ b/mm/2s2h/Rando/DrawItem.cpp
@@ -364,7 +364,7 @@ void DrawTriforcePiece(RandoItemId randoItemId) {
(Gfx*)gTriforcePiece2DL,
};
- u8 currentTriforcePieces = gSaveContext.save.shipSaveInfo.rando.foundTriforcePieces;
+ u16 currentTriforcePieces = gSaveContext.save.shipSaveInfo.rando.foundTriforcePieces;
OPEN_DISPS(gPlayState->state.gfxCtx);
diff --git a/mm/include/z64save.h b/mm/include/z64save.h
index 3dfb34a14..a52f79ab2 100644
--- a/mm/include/z64save.h
+++ b/mm/include/z64save.h
@@ -387,7 +387,7 @@ typedef struct RandoSaveInfo {
u32 randoSaveOptions[RO_MAX]; // Type here may change in the future
char randoStartingItems[512];
s8 foundDungeonKeys[9]; // Tracks the number of dungeon keys found, opposed to the number of keys in the inventory
- u8 foundTriforcePieces;
+ u16 foundTriforcePieces;
} RandoSaveInfo;
// These are values added by 2S2H that we need to be persisted to the save file