diff --git a/include/z64save.h b/include/z64save.h
index dc31596c27..d983bd6341 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -802,7 +802,7 @@ typedef enum {
 #define WEEKEVENTREG_22_10 PACK_WEEKEVENTREG_FLAG(22, 0x10)
 #define WEEKEVENTREG_22_20 PACK_WEEKEVENTREG_FLAG(22, 0x20)
 #define WEEKEVENTREG_22_40 PACK_WEEKEVENTREG_FLAG(22, 0x40)
-#define WEEKEVENTREG_22_80 PACK_WEEKEVENTREG_FLAG(22, 0x80)
+#define WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE PACK_WEEKEVENTREG_FLAG(22, 0x80)
 #define WEEKEVENTREG_23_01 PACK_WEEKEVENTREG_FLAG(23, 0x01)
 #define WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK PACK_WEEKEVENTREG_FLAG(23, 0x02)
 #define WEEKEVENTREG_23_04 PACK_WEEKEVENTREG_FLAG(23, 0x04)
@@ -810,7 +810,7 @@ typedef enum {
 #define WEEKEVENTREG_23_10 PACK_WEEKEVENTREG_FLAG(23, 0x10)
 #define WEEKEVENTREG_23_20 PACK_WEEKEVENTREG_FLAG(23, 0x20)
 #define WEEKEVENTREG_23_40 PACK_WEEKEVENTREG_FLAG(23, 0x40)
-#define WEEKEVENTREG_23_80 PACK_WEEKEVENTREG_FLAG(23, 0x80)
+#define WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE PACK_WEEKEVENTREG_FLAG(23, 0x80)
 #define WEEKEVENTREG_24_01 PACK_WEEKEVENTREG_FLAG(24, 0x01)
 #define WEEKEVENTREG_24_02 PACK_WEEKEVENTREG_FLAG(24, 0x02)
 #define WEEKEVENTREG_24_04 PACK_WEEKEVENTREG_FLAG(24, 0x04)
@@ -827,7 +827,7 @@ typedef enum {
 // The player has talked to the Goron Child at least once
 #define WEEKEVENTREG_24_80 PACK_WEEKEVENTREG_FLAG(24, 0x80)
 
-#define WEEKEVENTREG_25_01 PACK_WEEKEVENTREG_FLAG(25, 0x01)
+#define WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE PACK_WEEKEVENTREG_FLAG(25, 0x01)
 #define WEEKEVENTREG_25_02 PACK_WEEKEVENTREG_FLAG(25, 0x02)
 #define WEEKEVENTREG_25_04 PACK_WEEKEVENTREG_FLAG(25, 0x04)
 
@@ -896,7 +896,7 @@ typedef enum {
 // Player is playing the Milk Run
 #define WEEKEVENTREG_31_80 PACK_WEEKEVENTREG_FLAG(31, 0x80)
 
-#define WEEKEVENTREG_32_01 PACK_WEEKEVENTREG_FLAG(32, 0x01)
+#define WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE PACK_WEEKEVENTREG_FLAG(32, 0x01)
 #define WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_HEART_PIECE PACK_WEEKEVENTREG_FLAG(32, 0x02)
 #define WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_HEART_PIECE PACK_WEEKEVENTREG_FLAG(32, 0x04)
 #define WEEKEVENTREG_32_08 PACK_WEEKEVENTREG_FLAG(32, 0x08)
@@ -944,7 +944,7 @@ typedef enum {
 #define WEEKEVENTREG_35_40 PACK_WEEKEVENTREG_FLAG(35, 0x40)
 
 // Obtained Heart Piece from Five Frogs of the Frog Choir
-#define WEEKEVENTREG_35_80 PACK_WEEKEVENTREG_FLAG(35, 0x80)
+#define WEEKEVENTREG_RECEIVED_FROG_CHOIR_HEART_PIECE PACK_WEEKEVENTREG_FLAG(35, 0x80)
 
 // Player has spoken to certain shrine gorons in the winter
 #define WEEKEVENTREG_36_01 PACK_WEEKEVENTREG_FLAG(36, 0x01)
@@ -977,7 +977,7 @@ typedef enum {
 #define WEEKEVENTREG_39_04 PACK_WEEKEVENTREG_FLAG(39, 0x04)
 #define WEEKEVENTREG_39_08 PACK_WEEKEVENTREG_FLAG(39, 0x08)
 #define WEEKEVENTREG_39_10 PACK_WEEKEVENTREG_FLAG(39, 0x10)
-#define WEEKEVENTREG_39_20 PACK_WEEKEVENTREG_FLAG(39, 0x20)
+#define WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE PACK_WEEKEVENTREG_FLAG(39, 0x20)
 #define WEEKEVENTREG_39_40 PACK_WEEKEVENTREG_FLAG(39, 0x40)
 #define WEEKEVENTREG_39_80 PACK_WEEKEVENTREG_FLAG(39, 0x80)
 #define WEEKEVENTREG_40_01 PACK_WEEKEVENTREG_FLAG(40, 0x01)
@@ -1054,7 +1054,7 @@ typedef enum {
 #define WEEKEVENTREG_54_08 PACK_WEEKEVENTREG_FLAG(54, 0x08)
 #define WEEKEVENTREG_54_10 PACK_WEEKEVENTREG_FLAG(54, 0x10)
 #define WEEKEVENTREG_54_20 PACK_WEEKEVENTREG_FLAG(54, 0x20)
-#define WEEKEVENTREG_54_40 PACK_WEEKEVENTREG_FLAG(54, 0x40)
+#define WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE PACK_WEEKEVENTREG_FLAG(54, 0x40)
 #define WEEKEVENTREG_54_80 PACK_WEEKEVENTREG_FLAG(54, 0x80)
 #define WEEKEVENTREG_55_01 PACK_WEEKEVENTREG_FLAG(55, 0x01)
 
@@ -1071,7 +1071,7 @@ typedef enum {
 #define WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE PACK_WEEKEVENTREG_FLAG(55, 0x80)
 
 #define WEEKEVENTREG_56_01 PACK_WEEKEVENTREG_FLAG(56, 0x01)
-#define WEEKEVENTREG_56_02 PACK_WEEKEVENTREG_FLAG(56, 0x02)
+#define WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE PACK_WEEKEVENTREG_FLAG(56, 0x02)
 #define WEEKEVENTREG_56_04 PACK_WEEKEVENTREG_FLAG(56, 0x04)
 #define WEEKEVENTREG_56_08 PACK_WEEKEVENTREG_FLAG(56, 0x08)
 #define WEEKEVENTREG_56_10 PACK_WEEKEVENTREG_FLAG(56, 0x10)
@@ -1100,7 +1100,7 @@ typedef enum {
 // Unconfirmed: "Entered South Clock Town"
 #define WEEKEVENTREG_59_04 PACK_WEEKEVENTREG_FLAG(59, 0x04)
 
-#define WEEKEVENTREG_59_08 PACK_WEEKEVENTREG_FLAG(59, 0x08)
+#define WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE PACK_WEEKEVENTREG_FLAG(59, 0x08)
 #define WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_QUIVER_UPGRADE PACK_WEEKEVENTREG_FLAG(59, 0x10)
 #define WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_QUIVER_UPGRADE PACK_WEEKEVENTREG_FLAG(59, 0x20)
 #define WEEKEVENTREG_59_40 PACK_WEEKEVENTREG_FLAG(59, 0x40)
@@ -1109,7 +1109,7 @@ typedef enum {
 #define WEEKEVENTREG_60_02 PACK_WEEKEVENTREG_FLAG(60, 0x02)
 #define WEEKEVENTREG_60_04 PACK_WEEKEVENTREG_FLAG(60, 0x04)
 #define WEEKEVENTREG_ATTENDED_MAYOR_MEETING PACK_WEEKEVENTREG_FLAG(60, 0x08)
-#define WEEKEVENTREG_RECEIVED_MAYOR_REWARD PACK_WEEKEVENTREG_FLAG(60, 0x10)
+#define WEEKEVENTREG_RECEIVED_MAYOR_HEART_PIECE PACK_WEEKEVENTREG_FLAG(60, 0x10)
 #define WEEKEVENTREG_60_20 PACK_WEEKEVENTREG_FLAG(60, 0x20)
 #define WEEKEVENTREG_TALKED_MAYOR_NIGHT_3 PACK_WEEKEVENTREG_FLAG(60, 0x40)
 #define WEEKEVENTREG_60_80 PACK_WEEKEVENTREG_FLAG(60, 0x80)
@@ -1138,7 +1138,7 @@ typedef enum {
 #define WEEKEVENTREG_63_04 PACK_WEEKEVENTREG_FLAG(63, 0x04)
 #define WEEKEVENTREG_63_08 PACK_WEEKEVENTREG_FLAG(63, 0x08)
 #define WEEKEVENTREG_63_10 PACK_WEEKEVENTREG_FLAG(63, 0x10)
-#define WEEKEVENTREG_63_20 PACK_WEEKEVENTREG_FLAG(63, 0x20)
+#define WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE PACK_WEEKEVENTREG_FLAG(63, 0x20)
 #define WEEKEVENTREG_63_40 PACK_WEEKEVENTREG_FLAG(63, 0x40)
 
 // Showed Couple's Mask at meeting
@@ -1259,7 +1259,7 @@ typedef enum {
 #define WEEKEVENTREG_76_20 PACK_WEEKEVENTREG_FLAG(76, 0x20)
 #define WEEKEVENTREG_76_40 PACK_WEEKEVENTREG_FLAG(76, 0x40)
 #define WEEKEVENTREG_76_80 PACK_WEEKEVENTREG_FLAG(76, 0x80)
-#define WEEKEVENTREG_77_01 PACK_WEEKEVENTREG_FLAG(77, 0x01)
+#define WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE PACK_WEEKEVENTREG_FLAG(77, 0x01)
 #define WEEKEVENTREG_77_02 PACK_WEEKEVENTREG_FLAG(77, 0x02)
 #define WEEKEVENTREG_77_04 PACK_WEEKEVENTREG_FLAG(77, 0x04)
 #define WEEKEVENTREG_77_08 PACK_WEEKEVENTREG_FLAG(77, 0x08)
@@ -1285,7 +1285,7 @@ typedef enum {
 #define WEEKEVENTREG_79_10 PACK_WEEKEVENTREG_FLAG(79, 0x10)
 #define WEEKEVENTREG_79_20 PACK_WEEKEVENTREG_FLAG(79, 0x20)
 #define WEEKEVENTREG_SAKON_DEAD PACK_WEEKEVENTREG_FLAG(79, 0x40)
-#define WEEKEVENTREG_79_80 PACK_WEEKEVENTREG_FLAG(79, 0x80)
+#define WEEKEVENTREG_RECEIVED_KEATON_HEART_PIECE PACK_WEEKEVENTREG_FLAG(79, 0x80)
 #define WEEKEVENTREG_80_01 PACK_WEEKEVENTREG_FLAG(80, 0x01)
 #define WEEKEVENTREG_80_02 PACK_WEEKEVENTREG_FLAG(80, 0x02)
 #define WEEKEVENTREG_80_04 PACK_WEEKEVENTREG_FLAG(80, 0x04)
@@ -1313,7 +1313,7 @@ typedef enum {
 
 // Related to Swordsman's log minigame
 #define WEEKEVENTREG_82_08 PACK_WEEKEVENTREG_FLAG(82, 0x08)
-#define WEEKEVENTREG_82_10 PACK_WEEKEVENTREG_FLAG(82, 0x10)
+#define WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE PACK_WEEKEVENTREG_FLAG(82, 0x10)
 #define WEEKEVENTREG_82_20 PACK_WEEKEVENTREG_FLAG(82, 0x20)
 #define WEEKEVENTREG_82_40 PACK_WEEKEVENTREG_FLAG(82, 0x40)
 #define WEEKEVENTREG_82_80 PACK_WEEKEVENTREG_FLAG(82, 0x80)
@@ -1415,7 +1415,7 @@ typedef enum {
 #define WEEKEVENTREG_90_02 PACK_WEEKEVENTREG_FLAG(90, 0x02)
 #define WEEKEVENTREG_90_04 PACK_WEEKEVENTREG_FLAG(90, 0x04)
 #define WEEKEVENTREG_90_08 PACK_WEEKEVENTREG_FLAG(90, 0x08)
-#define WEEKEVENTREG_90_10 PACK_WEEKEVENTREG_FLAG(90, 0x10)
+#define WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE PACK_WEEKEVENTREG_FLAG(90, 0x10)
 
 // Related to Fishermans's jumping minigame
 #define WEEKEVENTREG_90_20 PACK_WEEKEVENTREG_FLAG(90, 0x20)
diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c
index 6966bd356b..2658a6ef6b 100644
--- a/src/code/z_sram_NES.c
+++ b/src/code/z_sram_NES.c
@@ -96,11 +96,12 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
     /* 19 */ 0,
     /* 20 */ 0,
     /* 21 */ 0,
-    /* 22 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_22_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_22_80),
+    /* 22 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_22_02) |
+        PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE),
     /* 23 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK) |
-        PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_23_80),
+        PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE),
     /* 24 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_24_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_24_80),
-    /* 25 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_25_01),
+    /* 25 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE),
     /* 26 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_26_40),
     /* 27 */ 0,
     /* 28 */ 0,
@@ -112,7 +113,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
     PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_01) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_02) |
         PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_20),
     /* 32 */
-    PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_32_01) |
+    PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE) |
         PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_HEART_PIECE) |
         PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_HEART_PIECE),
     /* 33 */ 0,
@@ -124,11 +125,11 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
         PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_ROMANI_RANCH) |
         PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_GREAT_BAY) |
         PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_STONE_TOWER) |
-        PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_35_80),
+        PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FROG_CHOIR_HEART_PIECE),
     /* 36 */ 0,
     /* 37 */ 0,
     /* 38 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_38_20),
-    /* 39 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_39_20),
+    /* 39 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE),
     /* 40 */ 0,
     /* 41 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_41_08),
     /* 42 */ 0,
@@ -143,19 +144,19 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
     /* 51 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_51_04),
     /* 52 */ 0,
     /* 53 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_53_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_53_40),
-    /* 54 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_54_40),
+    /* 54 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE),
     /* 55 */ 0,
-    /* 56 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_56_02),
+    /* 56 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE),
     /* 57 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_57_08),
     /* 58 */ 0,
     /* 59 */
-    PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_08) |
+    PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE) |
         PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_QUIVER_UPGRADE) |
         PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_QUIVER_UPGRADE),
-    /* 60 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_REWARD),
+    /* 60 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_HEART_PIECE),
     /* 61 */ 0,
     /* 62 */ 0,
-    /* 63 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_63_20),
+    /* 63 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE),
     /* 64 */ 0,
     /* 65 */ 0,
     /* 66 */
@@ -225,12 +226,12 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
     /* 74 */ 0,
     /* 75 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_75_80),
     /* 76 */ 0,
-    /* 77 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_77_01),
+    /* 77 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE),
     /* 78 */ 0,
-    /* 79 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_79_80),
+    /* 79 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_KEATON_HEART_PIECE),
     /* 80 */ 0,
     /* 81 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_81_08),
-    /* 82 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_82_10),
+    /* 82 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE),
     /* 83 */ 0,
     /* 84 */ 0,
     /* 85 */ 0,
@@ -241,7 +242,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
         PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_87_40) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_87_80),
     /* 88 */ 0,
     /* 89 */ 0,
-    /* 90 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_90_10),
+    /* 90 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE),
     /* 91 */ 0,
     /* 92 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_92_80),
     /* 93 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_93_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_93_08),
diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c
index bae2a137f7..d5b8011b15 100644
--- a/src/overlays/actors/ovl_En_Az/z_en_az.c
+++ b/src/overlays/actors/ovl_En_Az/z_en_az.c
@@ -1004,11 +1004,11 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
 
                     case 0x10F1:
                         SET_WEEKEVENTREG(WEEKEVENTREG_93_01);
-                        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_23_80)) {
+                        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE)) {
                             this->getItemId = GI_RUPEE_RED;
                         } else {
                             this->getItemId = GI_BOTTLE;
-                            SET_WEEKEVENTREG(WEEKEVENTREG_23_80);
+                            SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE);
                         }
                         SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationSpeedInfo, BEAVER_ANIM_IDLE,
                                                         &this->animIndex);
@@ -1059,7 +1059,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
                     case 0x10F8:
                         if (play->msgCtx.choiceIndex == 0) {
                             Audio_PlaySfx_MessageDecide();
-                            if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
+                            if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE)) {
                                 this->actor.textId = 0x1107;
                             } else {
                                 this->actor.textId = 0x10FA;
@@ -1117,7 +1117,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
                     case 0x10FE:
                         if (play->msgCtx.choiceIndex == 0) {
                             Audio_PlaySfx_MessageDecide();
-                            if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
+                            if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE)) {
                                 this->actor.textId = 0x1108;
                             } else {
                                 this->actor.textId = 0x1101;
@@ -1176,11 +1176,11 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
                         break;
 
                     case 0x1105:
-                        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
+                        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE)) {
                             this->getItemId = GI_RUPEE_PURPLE;
                         } else {
                             this->getItemId = GI_HEART_PIECE;
-                            SET_WEEKEVENTREG(WEEKEVENTREG_25_01);
+                            SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE);
                         }
                         SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationSpeedInfo, BEAVER_ANIM_IDLE,
                                                         &this->animIndex);
@@ -1593,7 +1593,7 @@ void func_80A97D5C(EnAz* this, PlayState* play) {
     play->interfaceCtx.minigameState = MINIGAME_STATE_COUNTDOWN_SETUP_3;
     if ((this->unk_2FA == 1) || (this->unk_2FA == 3)) {
         Interface_StartTimer(TIMER_ID_MINIGAME_2, 120);
-    } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
+    } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE)) {
         Interface_StartTimer(TIMER_ID_MINIGAME_2, 100);
     } else {
         Interface_StartTimer(TIMER_ID_MINIGAME_2, 110);
diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c
index ec779f0dc6..4e0af45ffa 100644
--- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c
+++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c
@@ -94,7 +94,7 @@ void EnColMan_Destroy(Actor* thisx, PlayState* play) {
 }
 
 void func_80AFDD60(EnColMan* this) {
-    if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_56_02)) {
+    if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE)) {
         this->actor.draw = func_80AFE414;
         this->actor.shape.yOffset = 700.0f;
         if (this->actor.params == EN_COL_MAN_HEART_PIECE) {
@@ -123,14 +123,14 @@ void func_80AFDE00(EnColMan* this, PlayState* play) {
             this->actor.speed = 0.0f;
         }
     }
-    if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_56_02)) {
+    if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE)) {
         this->actor.shape.rot.y += 0x3E8;
     }
     if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
         this->actor.draw = NULL;
         this->actionFunc = EnColMan_SetHeartPieceCollectedAndKill;
-    } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_56_02)) {
+    } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE)) {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 40.0f, 40.0f);
     } else {
         Actor_OfferGetItem(&this->actor, play, GI_RECOVERY_HEART, 40.0f, 40.0f);
@@ -139,7 +139,7 @@ void func_80AFDE00(EnColMan* this, PlayState* play) {
 
 void EnColMan_SetHeartPieceCollectedAndKill(EnColMan* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        SET_WEEKEVENTREG(WEEKEVENTREG_56_02);
+        SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE);
         Actor_Kill(&this->actor);
     }
 }
diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c
index b0e5dd0f83..b0a6ba0536 100644
--- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c
+++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c
@@ -356,7 +356,7 @@ void EnDt_SetupCutsceneNpcs(EnDt* this, PlayState* play) {
 void EnDt_SetupRegularState(EnDt* this, PlayState* play) {
     this->textIdIndex = 0;
 
-    if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_REWARD)) {
+    if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_HEART_PIECE)) {
         if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RESOLVED_MAYOR_MEETING)) {
             this->textIdIndex = 21;
             this->appearancePhase = EN_DT_APPEARANCE_RESOLVED_MEETING;
@@ -698,7 +698,7 @@ void EnDt_TriggerMeetingRewardEvent(EnDt* this, PlayState* play) {
 
         Actor_OfferTalkExchange(&this->actor, play, 400.0f, 400.0f, PLAYER_IA_MINUS1);
 
-        SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_REWARD);
+        SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_HEART_PIECE);
         this->actionFunc = EnDt_TriggerMeetingNotebookEvent;
     } else {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 300.0f, 300.0f);
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
index 497011ee81..f67484c6ca 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
@@ -903,7 +903,7 @@ void func_80963560(EnFu* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
         func_80963610(this);
-    } else if ((this->unk_552 == 0x2880) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_22_80)) {
+    } else if ((this->unk_552 == 0x2880) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE)) {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 500.0f, 100.0f);
     } else {
         Actor_OfferGetItem(&this->actor, play, GI_RUPEE_PURPLE, 500.0f, 100.0f);
@@ -925,8 +925,8 @@ void func_80963630(EnFu* this, PlayState* play) {
             if (CHECK_WEEKEVENTREG(WEEKEVENTREG_22_40)) {
                 Message_StartTextbox(play, 0x2884, &this->actor);
                 this->unk_552 = 0x2884;
-            } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_22_80)) {
-                SET_WEEKEVENTREG(WEEKEVENTREG_22_80);
+            } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE)) {
+                SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE);
                 Message_StartTextbox(play, 0x2882, &this->actor);
                 this->unk_552 = 0x2882;
             } else {
diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
index 0b867203b3..60472c2eb1 100644
--- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
+++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
@@ -633,7 +633,7 @@ void func_80B10868(EnGb2* this, PlayState* play) {
 void func_80B10924(EnGb2* this, PlayState* play) {
     s32 getItemId;
 
-    if (CHECK_WEEKEVENTREG(WEEKEVENTREG_54_40)) {
+    if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE)) {
         getItemId = GI_RUPEE_PURPLE;
     } else {
         getItemId = GI_HEART_PIECE;
@@ -642,7 +642,7 @@ void func_80B10924(EnGb2* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
         if (getItemId == GI_HEART_PIECE) {
-            SET_WEEKEVENTREG(WEEKEVENTREG_54_40);
+            SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE);
         } else {
             Rupees_ChangeBy(50);
         }
diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
index dc6a137d53..69f871bc4e 100644
--- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
@@ -551,7 +551,7 @@ void EnGinkoMan_BankAward(EnGinkoMan* this, PlayState* play) {
         }
     } else if (this->curTextId == 0x45C) {
         Actor_OfferGetItem(&this->actor, play, GI_RUPEE_BLUE, 500.0f, 100.0f);
-    } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_59_08)) {
+    } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE)) {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 500.0f, 100.0f);
     } else {
         Actor_OfferGetItem(&this->actor, play, GI_RUPEE_BLUE, 500.0f, 100.0f);
@@ -579,8 +579,8 @@ void EnGinkoMan_BankAward2(EnGinkoMan* this, PlayState* play) {
         EnGinkoMan_SetupDialogue(this);
     } else if (this->curTextId == 0x45D) { // saved up 5000 rupees for HP
         if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-            if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_59_08)) {
-                SET_WEEKEVENTREG(WEEKEVENTREG_59_08);
+            if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE)) {
+                SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE);
             }
             EnGinkoMan_SetupIdle(this);
         }
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
index e188be08b8..0f69932bfd 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
@@ -504,8 +504,8 @@ void func_8099874C(EnGs* this, PlayState* play) {
                         break;
                 }
 
-                if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_90_10)) {
-                    SET_WEEKEVENTREG(WEEKEVENTREG_90_10);
+                if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE)) {
+                    SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE);
                     this->getItemId = GI_HEART_PIECE;
                 }
 
diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
index 2f1a1705ee..0433e5b845 100644
--- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
+++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
@@ -391,11 +391,11 @@ void func_80C14540(EnJgameTsn* this) {
 
 void func_80C14554(EnJgameTsn* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
-        if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_82_10)) {
-            SET_WEEKEVENTREG(WEEKEVENTREG_82_10);
+        if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE)) {
+            SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE);
         }
         func_80C145FC(this);
-    } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_82_10)) {
+    } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE)) {
         Actor_OfferGetItem(&this->actor, play, GI_RUPEE_PURPLE, 500.0f, 100.0f);
     } else {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 500.0f, 100.0f);
diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
index 2c53afc4b6..f71c8551d3 100644
--- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
+++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
@@ -671,7 +671,7 @@ void func_80B276D8(EnKendoJs* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
         func_80B27760(this);
-    } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_63_20)) {
+    } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE)) {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 800.0f, 100.0f);
     } else {
         Actor_OfferGetItem(&this->actor, play, GI_RUPEE_RED, 800.0f, 100.0f);
@@ -686,8 +686,8 @@ void func_80B27774(EnKendoJs* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
-        if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_63_20)) {
-            SET_WEEKEVENTREG(WEEKEVENTREG_63_20);
+        if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE)) {
+            SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE);
             Message_StartTextbox(play, 0x272F, &this->actor);
             this->unk_288 = 0x272F;
         } else {
diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c
index adc1bc1c2c..eafbe78e70 100644
--- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c
+++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c
@@ -188,12 +188,12 @@ void EnKitan_OfferPrize(EnKitan* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
         this->actionFunc = EnKitan_WaitForPrizeTextboxClosed;
-        SET_WEEKEVENTREG(WEEKEVENTREG_79_80);
+        SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_KEATON_HEART_PIECE);
         return;
     }
 
     // Reward the player with a heart piece, or a red rupee if the heart piece was already obtained.
-    if (CHECK_WEEKEVENTREG(WEEKEVENTREG_79_80)) {
+    if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_KEATON_HEART_PIECE)) {
         Actor_OfferGetItem(&this->actor, play, GI_RUPEE_RED, 2000.0f, 1000.0f);
     } else {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 2000.0f, 1000.0f);
diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
index a63b1c676c..32ca10a704 100644
--- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
+++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
@@ -540,11 +540,11 @@ void EnMinifrog_YellowFrogDialog(EnMinifrog* this, PlayState* play) {
                         break;
 
                     case 0xD7C:
-                        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_35_80)) { // Obtained Heart Piece
+                        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FROG_CHOIR_HEART_PIECE)) {
                             Message_ContinueTextbox(play, 0xD7E);
                         } else {
                             Message_ContinueTextbox(play, 0xD7D); // Get Heart Piece
-                            SET_WEEKEVENTREG(WEEKEVENTREG_35_80);
+                            SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FROG_CHOIR_HEART_PIECE);
                         }
                         break;
 
diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
index e4d0f192ab..189ecbc02b 100644
--- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
+++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
@@ -445,12 +445,12 @@ void func_80A6FE1C(EnMm3* this) {
 
 void func_80A6FE30(EnMm3* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
-        if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_77_01)) {
-            SET_WEEKEVENTREG(WEEKEVENTREG_77_01);
+        if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE)) {
+            SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE);
         }
         this->actor.parent = NULL;
         func_80A6FED8(this);
-    } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_77_01)) {
+    } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE)) {
         Actor_OfferGetItem(&this->actor, play, GI_RUPEE_PURPLE, 500.0f, 100.0f);
     } else {
         Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 500.0f, 100.0f);
diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c
index 568834c0a8..7a469a5f36 100644
--- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c
+++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c
@@ -201,7 +201,7 @@ void EnOt_Init(Actor* thisx, PlayState* play) {
                             this->unk_394.y = this->actor.world.pos.y;
                             this->unk_394.z = (this->actor.world.pos.z + this->unk_360->actor.world.pos.z) * 0.5f;
                             Math_Vec3f_Copy(&this->unk_360->unk_394, &this->unk_394);
-                            if (CHECK_WEEKEVENTREG(WEEKEVENTREG_32_01)) {
+                            if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE)) {
                                 func_80B5C244(this, play);
                             } else {
                                 func_80B5C684(this, play);
@@ -260,7 +260,7 @@ void EnOt_Init(Actor* thisx, PlayState* play) {
                 case 1:
                     Actor_SetScale(&this->actor, 1.3f * 0.01f);
                     if (CHECK_WEEKEVENTREG(WEEKEVENTREG_84_10)) {
-                        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_32_01)) {
+                        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE)) {
                             func_80B5C244(this, play);
                         } else {
                             func_80B5C684(this, play);
@@ -394,12 +394,13 @@ void func_80B5BFB8(EnOt* this, PlayState* play) {
 }
 
 void func_80B5C154(EnOt* this, PlayState* play) {
-    if (CHECK_WEEKEVENTREG(WEEKEVENTREG_32_01)) {
+    if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE)) {
         this->getItemId = GI_RUPEE_RED;
     } else {
         this->getItemId = GI_HEART_PIECE;
-        SET_WEEKEVENTREG(WEEKEVENTREG_32_01);
+        SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE);
     }
+
     Actor_OfferGetItem(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
     this->actionFunc = func_80B5C1CC;
 }
diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c
index 5d7ff92ad6..8bce1e6cbd 100644
--- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c
+++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c
@@ -264,11 +264,11 @@ void func_80BBB354(EnZos* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
         this->actor.parent = NULL;
         this->actionFunc = func_80BBB2C4;
-        SET_WEEKEVENTREG(WEEKEVENTREG_39_20);
+        SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE);
         this->actor.flags |= ACTOR_FLAG_10000;
         Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
     } else {
-        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_39_20)) {
+        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE)) {
             getItemId = GI_RUPEE_PURPLE;
         } else {
             getItemId = GI_HEART_PIECE;
diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py
index 6f8a2c1c22..ef57a1ea18 100755
--- a/tools/weekeventregconvert.py
+++ b/tools/weekeventregconvert.py
@@ -187,7 +187,7 @@ weekEventReg = {
     (22 << 8) | 0x10: "WEEKEVENTREG_22_10",
     (22 << 8) | 0x20: "WEEKEVENTREG_22_20",
     (22 << 8) | 0x40: "WEEKEVENTREG_22_40",
-    (22 << 8) | 0x80: "WEEKEVENTREG_22_80",
+    (22 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE",
     (23 << 8) | 0x01: "WEEKEVENTREG_23_01",
     (23 << 8) | 0x02: "WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK",
     (23 << 8) | 0x04: "WEEKEVENTREG_23_04",
@@ -195,7 +195,7 @@ weekEventReg = {
     (23 << 8) | 0x10: "WEEKEVENTREG_23_10",
     (23 << 8) | 0x20: "WEEKEVENTREG_23_20",
     (23 << 8) | 0x40: "WEEKEVENTREG_23_40",
-    (23 << 8) | 0x80: "WEEKEVENTREG_23_80",
+    (23 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE",
     (24 << 8) | 0x01: "WEEKEVENTREG_24_01",
     (24 << 8) | 0x02: "WEEKEVENTREG_24_02",
     (24 << 8) | 0x04: "WEEKEVENTREG_24_04",
@@ -204,7 +204,7 @@ weekEventReg = {
     (24 << 8) | 0x20: "WEEKEVENTREG_24_20",
     (24 << 8) | 0x40: "WEEKEVENTREG_24_40",
     (24 << 8) | 0x80: "WEEKEVENTREG_24_80",
-    (25 << 8) | 0x01: "WEEKEVENTREG_25_01",
+    (25 << 8) | 0x01: "WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE",
     (25 << 8) | 0x02: "WEEKEVENTREG_25_02",
     (25 << 8) | 0x04: "WEEKEVENTREG_25_04",
     (25 << 8) | 0x08: "WEEKEVENTREG_25_08",
@@ -260,7 +260,7 @@ weekEventReg = {
     (31 << 8) | 0x20: "WEEKEVENTREG_31_20",
     (31 << 8) | 0x40: "WEEKEVENTREG_31_40",
     (31 << 8) | 0x80: "WEEKEVENTREG_31_80",
-    (32 << 8) | 0x01: "WEEKEVENTREG_32_01",
+    (32 << 8) | 0x01: "WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE",
     (32 << 8) | 0x02: "WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_HEART_PIECE",
     (32 << 8) | 0x04: "WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_HEART_PIECE",
     (32 << 8) | 0x08: "WEEKEVENTREG_32_08",
@@ -291,7 +291,7 @@ weekEventReg = {
     (35 << 8) | 0x10: "WEEKEVENTREG_TINGLE_MAP_BOUGHT_GREAT_BAY",
     (35 << 8) | 0x20: "WEEKEVENTREG_TINGLE_MAP_BOUGHT_STONE_TOWER",
     (35 << 8) | 0x40: "WEEKEVENTREG_35_40",
-    (35 << 8) | 0x80: "WEEKEVENTREG_35_80",
+    (35 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_FROG_CHOIR_HEART_PIECE",
     (36 << 8) | 0x01: "WEEKEVENTREG_36_01",
     (36 << 8) | 0x02: "WEEKEVENTREG_36_02",
     (36 << 8) | 0x04: "WEEKEVENTREG_36_04",
@@ -321,7 +321,7 @@ weekEventReg = {
     (39 << 8) | 0x04: "WEEKEVENTREG_39_04",
     (39 << 8) | 0x08: "WEEKEVENTREG_39_08",
     (39 << 8) | 0x10: "WEEKEVENTREG_39_10",
-    (39 << 8) | 0x20: "WEEKEVENTREG_39_20",
+    (39 << 8) | 0x20: "WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE",
     (39 << 8) | 0x40: "WEEKEVENTREG_39_40",
     (39 << 8) | 0x80: "WEEKEVENTREG_39_80",
     (40 << 8) | 0x01: "WEEKEVENTREG_40_01",
@@ -442,7 +442,7 @@ weekEventReg = {
     (54 << 8) | 0x08: "WEEKEVENTREG_54_08",
     (54 << 8) | 0x10: "WEEKEVENTREG_54_10",
     (54 << 8) | 0x20: "WEEKEVENTREG_54_20",
-    (54 << 8) | 0x40: "WEEKEVENTREG_54_40",
+    (54 << 8) | 0x40: "WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE",
     (54 << 8) | 0x80: "WEEKEVENTREG_54_80",
     (55 << 8) | 0x01: "WEEKEVENTREG_55_01",
     (55 << 8) | 0x02: "WEEKEVENTREG_55_02",
@@ -453,7 +453,7 @@ weekEventReg = {
     (55 << 8) | 0x40: "WEEKEVENTREG_55_40",
     (55 << 8) | 0x80: "WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE",
     (56 << 8) | 0x01: "WEEKEVENTREG_56_01",
-    (56 << 8) | 0x02: "WEEKEVENTREG_56_02",
+    (56 << 8) | 0x02: "WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE",
     (56 << 8) | 0x04: "WEEKEVENTREG_56_04",
     (56 << 8) | 0x08: "WEEKEVENTREG_56_08",
     (56 << 8) | 0x10: "WEEKEVENTREG_56_10",
@@ -478,7 +478,7 @@ weekEventReg = {
     (58 << 8) | 0x80: "WEEKEVENTREG_58_80",
     (59 << 8) | 0x01: "WEEKEVENTREG_59_01",
     (59 << 8) | 0x02: "WEEKEVENTREG_59_02",
-    (59 << 8) | 0x08: "WEEKEVENTREG_59_08",
+    (59 << 8) | 0x08: "WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE",
     (59 << 8) | 0x04: "WEEKEVENTREG_59_04",
     (59 << 8) | 0x10: "WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_QUIVER_UPGRADE",
     (59 << 8) | 0x20: "WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_QUIVER_UPGRADE",
@@ -513,7 +513,7 @@ weekEventReg = {
     (63 << 8) | 0x04: "WEEKEVENTREG_63_04",
     (63 << 8) | 0x08: "WEEKEVENTREG_63_08",
     (63 << 8) | 0x10: "WEEKEVENTREG_63_10",
-    (63 << 8) | 0x20: "WEEKEVENTREG_63_20",
+    (63 << 8) | 0x20: "WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE",
     (63 << 8) | 0x40: "WEEKEVENTREG_63_40",
     (63 << 8) | 0x80: "WEEKEVENTREG_63_80",
     (64 << 8) | 0x01: "WEEKEVENTREG_64_01",
@@ -620,7 +620,7 @@ weekEventReg = {
     (76 << 8) | 0x20: "WEEKEVENTREG_76_20",
     (76 << 8) | 0x40: "WEEKEVENTREG_76_40",
     (76 << 8) | 0x80: "WEEKEVENTREG_76_80",
-    (77 << 8) | 0x01: "WEEKEVENTREG_77_01",
+    (77 << 8) | 0x01: "WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE",
     (77 << 8) | 0x02: "WEEKEVENTREG_77_02",
     (77 << 8) | 0x04: "WEEKEVENTREG_77_04",
     (77 << 8) | 0x08: "WEEKEVENTREG_77_08",
@@ -643,7 +643,7 @@ weekEventReg = {
     (79 << 8) | 0x10: "WEEKEVENTREG_79_10",
     (79 << 8) | 0x20: "WEEKEVENTREG_79_20",
     (79 << 8) | 0x40: "WEEKEVENTREG_SAKON_DEAD",
-    (79 << 8) | 0x80: "WEEKEVENTREG_79_80",
+    (79 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_KEATON_HEART_PIECE",
     (80 << 8) | 0x01: "WEEKEVENTREG_80_01",
     (80 << 8) | 0x02: "WEEKEVENTREG_80_02",
     (80 << 8) | 0x04: "WEEKEVENTREG_80_04",
@@ -664,7 +664,7 @@ weekEventReg = {
     (82 << 8) | 0x02: "WEEKEVENTREG_82_02",
     (82 << 8) | 0x04: "WEEKEVENTREG_82_04",
     (82 << 8) | 0x08: "WEEKEVENTREG_82_08",
-    (82 << 8) | 0x10: "WEEKEVENTREG_82_10",
+    (82 << 8) | 0x10: "WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE",
     (82 << 8) | 0x20: "WEEKEVENTREG_82_20",
     (82 << 8) | 0x40: "WEEKEVENTREG_82_40",
     (82 << 8) | 0x80: "WEEKEVENTREG_82_80",
@@ -728,7 +728,7 @@ weekEventReg = {
     (90 << 8) | 0x02: "WEEKEVENTREG_90_02",
     (90 << 8) | 0x04: "WEEKEVENTREG_90_04",
     (90 << 8) | 0x08: "WEEKEVENTREG_90_08",
-    (90 << 8) | 0x10: "WEEKEVENTREG_90_10",
+    (90 << 8) | 0x10: "WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE",
     (90 << 8) | 0x20: "WEEKEVENTREG_90_20",
     (90 << 8) | 0x40: "WEEKEVENTREG_90_40",
     (90 << 8) | 0x80: "WEEKEVENTREG_90_80",