diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp
index 1dee72669..e0e8761c7 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp
@@ -167,11 +167,11 @@ void LocationTable_Init() {
     //Zoras River
     locationTable[ZR_OPEN_GROTTO_CHEST]                  = ItemLocation::Chest      (RC_ZR_OPEN_GROTTO_CHEST, 0x3E, 0x09, "ZR Open Grotto Chest",                 ZR_OPEN_GROTTO_CHEST,                  RED_RUPEE,                 {Category::cZorasRiver, Category::cGrotto,},                                                                                                                                   SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
     locationTable[ZR_MAGIC_BEAN_SALESMAN]                = ItemLocation::Base       (RC_ZR_MAGIC_BEAN_SALESMAN, 0x54, 0x16, "ZR Magic Bean Salesman",               ZR_MAGIC_BEAN_SALESMAN,                MAGIC_BEAN,                {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::MagicBeans(0x54, 0x01),          SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_ZELDAS_LULLABY]               = ItemLocation::Base       (RC_ZR_FROGS_ZELDAS_LULLABY, 0x54, 0x3E, "ZR Frogs Zelda's Lullaby",             ZR_FROGS_ZELDAS_LULLABY,               PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD6),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_EPONAS_SONG]                  = ItemLocation::Base       (RC_ZR_FROGS_EPONAS_SONG, 0x54, 0x3E, "ZR Frogs Epona's Song",                ZR_FROGS_EPONAS_SONG,                  PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD6),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_SARIAS_SONG]                  = ItemLocation::Base       (RC_ZR_FROGS_SARIAS_SONG, 0x54, 0x3E, "ZR Frogs Saria's Song",                ZR_FROGS_SARIAS_SONG,                  PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD6),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_SUNS_SONG]                    = ItemLocation::Base       (RC_ZR_FROGS_SUNS_SONG, 0x54, 0x3E, "ZR Frogs Sun's Song",                  ZR_FROGS_SUNS_SONG,                    PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD6),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
-    locationTable[ZR_FROGS_SONG_OF_TIME]                 = ItemLocation::Base       (RC_ZR_FROGS_SONG_OF_TIME, 0x54, 0x3E, "ZR Frogs Song of Time",                ZR_FROGS_SONG_OF_TIME,                 PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD6),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[ZR_FROGS_ZELDAS_LULLABY]               = ItemLocation::Base       (RC_ZR_FROGS_ZELDAS_LULLABY, 0x54, 0x3E, "ZR Frogs Zelda's Lullaby",             ZR_FROGS_ZELDAS_LULLABY,               PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD1),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[ZR_FROGS_EPONAS_SONG]                  = ItemLocation::Base       (RC_ZR_FROGS_EPONAS_SONG, 0x54, 0x3E, "ZR Frogs Epona's Song",                ZR_FROGS_EPONAS_SONG,                  PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD2),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[ZR_FROGS_SARIAS_SONG]                  = ItemLocation::Base       (RC_ZR_FROGS_SARIAS_SONG, 0x54, 0x3E, "ZR Frogs Saria's Song",                ZR_FROGS_SARIAS_SONG,                  PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD4),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[ZR_FROGS_SUNS_SONG]                    = ItemLocation::Base       (RC_ZR_FROGS_SUNS_SONG, 0x54, 0x3E, "ZR Frogs Sun's Song",                  ZR_FROGS_SUNS_SONG,                    PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD3),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
+    locationTable[ZR_FROGS_SONG_OF_TIME]                 = ItemLocation::Base       (RC_ZR_FROGS_SONG_OF_TIME, 0x54, 0x3E, "ZR Frogs Song of Time",                ZR_FROGS_SONG_OF_TIME,                 PURPLE_RUPEE,              {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD5),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
     locationTable[ZR_FROGS_IN_THE_RAIN]                  = ItemLocation::Base       (RC_ZR_FROGS_IN_THE_RAIN, 0x54, 0x3E, "ZR Frogs in the Rain",                 ZR_FROGS_IN_THE_RAIN,                  PIECE_OF_HEART,            {Category::cZorasRiver,},                                                                                             SpoilerCollectionCheck::EventChkInf(0xD6),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
     locationTable[ZR_FROGS_OCARINA_GAME]                 = ItemLocation::Base       (RC_ZR_FROGS_OCARINA_GAME, 0x54, 0x76, "ZR Frogs Ocarina Game",                ZR_FROGS_OCARINA_GAME,                 PIECE_OF_HEART,            {Category::cZorasRiver, Category::cMinigame,},                                                                        SpoilerCollectionCheck::EventChkInf(0xD0),               SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
     locationTable[ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH]  = ItemLocation::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, 0x54, 0x04, "ZR Near Open Grotto Freestanding PoH", ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,  PIECE_OF_HEART,            {Category::cZorasRiver,},                                                                                                                                                      SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index ed1fcb0b9..7ae4e8dcb 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -668,10 +668,7 @@ bool HasItemBeenCollected(RandomizerCheckObject obj) {
         case SpoilerCollectionCheckType::SPOILER_CHK_SCRUB:
             return Flags_GetRandomizerInf(randomizerFlagLookup[obj.rc]);
         case SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF:
-            // Magic to flip an index `flag` to a lookup for 16bit little endian integers. Probably an easier way.....
-            shift = 7 - (flag % 8) + (1 - ((flag % 16) / 8) * 8);
-            mask = 0x8000 >> shift;
-            return gSaveContext.eventChkInf[flag / 16] & mask;
+            return gSaveContext.eventChkInf[flag / 16] & (0x01 << flag % 16);
         case SpoilerCollectionCheckType::SPOILER_CHK_GERUDO_MEMBERSHIP_CARD:
             return CHECK_FLAG_ALL(gSaveContext.eventChkInf[0x09], 0x0F);
         case SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA: