1 files changed, 21 insertions, 21 deletions

diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp
index 727f4b46..db7d9fc4 100644
--- a/src/d/d_item.cpp
+++ b/src/d/d_item.cpp
@@ -589,10 +589,10 @@ void item_func_utuwa_heart() {
     dComIfGp_setItemLifeCount(dComIfGs_getMaxLife());
     
     stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
-    if (dStage_stagInfo_GetSaveTbl(stag_info) == 0) {
+    if (dStage_stagInfo_GetSaveTbl(stag_info) == dSv_save_c::STAGE_SEA) {
         // Didn't get the Heart Container immediately after defeating Helmaroc King.
         // Instead got it from outside Forsaken Fortress, on the sea stage.
-        dComIfGs_onStageLife(2);
+        dComIfGs_onStageLife(dSv_save_c::STAGE_FF);
     } else {
         dComIfGs_onStageLife();
     }
@@ -1424,47 +1424,47 @@ void item_func_tincle_rupee6() {
 
 /* 800C4DB4-800C4DE4       .text item_func_lithograph1__Fv */
 void item_func_lithograph1() {
-    dComIfGs_onEventBit(0x3508);
+    dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_1_e);
 }
 
 /* 800C4DE4-800C4E14       .text item_func_lithograph2__Fv */
 void item_func_lithograph2() {
-    dComIfGs_onEventBit(0x3504);
+    dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_2_e);
 }
 
 /* 800C4E14-800C4E44       .text item_func_lithograph3__Fv */
 void item_func_lithograph3() {
-    dComIfGs_onEventBit(0x3502);
+    dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_3_e);
 }
 
 /* 800C4E44-800C4E74       .text item_func_lithograph4__Fv */
 void item_func_lithograph4() {
-    dComIfGs_onEventBit(0x3501);
+    dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_4_e);
 }
 
 /* 800C4E74-800C4EA4       .text item_func_lithograph5__Fv */
 void item_func_lithograph5() {
-    dComIfGs_onEventBit(0x3680);
+    dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_5_e);
 }
 
 /* 800C4EA4-800C4ED4       .text item_func_lithograph6__Fv */
 void item_func_lithograph6() {
-    dComIfGs_onEventBit(0x3640);
+    dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_6_e);
 }
 
 /* 800C4ED4-800C4F04       .text item_func_collectmap64__Fv */
 void item_func_collectmap64() {
-    dComIfGs_onEventBit(0x3620);
+    dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_7_e);
 }
 
 /* 800C4F04-800C4F34       .text item_func_collectmap63__Fv */
 void item_func_collectmap63() {
-    dComIfGs_onEventBit(0x3610);
+    dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_8_e);
 }
 
 /* 800C4F34-800C4F64       .text item_func_collectmap62__Fv */
 void item_func_collectmap62() {
-    dComIfGs_onEventBit(0x3608);
+    dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_9_e);
 }
 
 /* 800C4F64-800C4FB8       .text item_func_collectmap61__Fv */
@@ -2531,52 +2531,52 @@ int item_getcheck_func_xxx_039() {
 
 /* 800C77E4-800C7814       .text item_getcheck_func_lithograph1__Fv */
 int item_getcheck_func_lithograph1() {
-    return dComIfGs_isEventBit(0x3508);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_1_e);
 }
 
 /* 800C7814-800C7844       .text item_getcheck_func_lithograph2__Fv */
 int item_getcheck_func_lithograph2() {
-    return dComIfGs_isEventBit(0x3504);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_2_e);
 }
 
 /* 800C7844-800C7874       .text item_getcheck_func_lithograph3__Fv */
 int item_getcheck_func_lithograph3() {
-    return dComIfGs_isEventBit(0x3502);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_3_e);
 }
 
 /* 800C7874-800C78A4       .text item_getcheck_func_lithograph4__Fv */
 int item_getcheck_func_lithograph4() {
-    return dComIfGs_isEventBit(0x3501);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_4_e);
 }
 
 /* 800C78A4-800C78D4       .text item_getcheck_func_lithograph5__Fv */
 int item_getcheck_func_lithograph5() {
-    return dComIfGs_isEventBit(0x3680);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_5_e);
 }
 
 /* 800C78D4-800C7904       .text item_getcheck_func_lithograph6__Fv */
 int item_getcheck_func_lithograph6() {
-    return dComIfGs_isEventBit(0x3640);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_6_e);
 }
 
 /* 800C7904-800C7934       .text item_getcheck_func_lithograph7__Fv */
 int item_getcheck_func_lithograph7() {
-    return dComIfGs_isEventBit(0x3620);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_7_e);
 }
 
 /* 800C7934-800C7964       .text item_getcheck_func_lithograph8__Fv */
 int item_getcheck_func_lithograph8() {
-    return dComIfGs_isEventBit(0x3610);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_8_e);
 }
 
 /* 800C7964-800C7994       .text item_getcheck_func_lithograph9__Fv */
 int item_getcheck_func_lithograph9() {
-    return dComIfGs_isEventBit(0x3608);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_9_e);
 }
 
 /* 800C7994-800C79C4       .text item_getcheck_func_lithograph10__Fv */
 int item_getcheck_func_lithograph10() {
-    return dComIfGs_isEventBit(0x3604);
+    return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_10_e);
 }
 
 /* 800C79C4-800C79F4       .text item_getcheck_func_lithograph11__Fv */