1 files changed, 10 insertions, 10 deletions

diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index f5b86ab5..f58170a6 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -7225,7 +7225,7 @@ BOOL daPy_lk_c::procAutoJump() {
         }
     } else if (speed.y < -gravity && mProcVar0.m3570 != 2) {
         if (mActorKeepGrab.getActor() != NULL && fopAcM_GetName(mActorKeepGrab.getActor()) == PROC_NPC_MD &&
-            dComIfGs_isEventBit(0x1620))
+            dComIfGs_isEventBit(dSv_event_flag_c::UNK_1620))
         {
             speed.y = 5.0f;
             gravity = 0.0f;
@@ -10873,8 +10873,8 @@ void daPy_lk_c::checkFallCode() {
         }
         if (dStage_changeSceneExitId(mAcch.m_gnd, dVar5, uVar3, bVar2)) {
             onNoResetFlg1(daPyFlg1_UNK100000);
-            if (dComIfGs_isEventBit(0x3e10)) {
-                dComIfGs_onEventBit(0x3e01);
+            if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E10)) {
+                dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E01);
             }
             daPy_py_c::changePlayer((daPy_py_c*)this);
             if ((!strcmp(dComIfGp_getStartStageName(), "GanonM")) && current.roomNo == 1) {
@@ -10924,7 +10924,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 mode, int eventInfoIdx, f32 param_3, int i_
         setDamagePoint(param_3);
         mTinkleShieldTimer = 0;
 
-        if (stageType == dStageType_SEA_e && !dComIfGs_isEventBit(dSv_evtBit_c::RODE_KORL) &&
+        if (stageType == dStageType_SEA_e && !dComIfGs_isEventBit(dSv_event_flag_c::RODE_KORL) &&
             (current.roomNo == dIsleRoom_WindfallIsland_e || current.roomNo == dIsleRoom_OutsetIsland_e) &&
             dStage_chkPlayerId(0x80, current.roomNo))
         {
@@ -11253,7 +11253,7 @@ BOOL daPy_lk_c::execute() {
         fopMsgM_demoMsgFlagOn();
         if (checkEndMessage(0x14A3)) {
             offNoResetFlg1(daPyFlg1_UNK200);
-            dComIfGs_setEventReg(0x9EFF, 0);
+            dComIfGs_setEventReg(dSv_event_flag_c::UNK_9EFF, 0);
             dComIfGp_event_reset();
             mDemo.setDemoType(0);
         }
@@ -12424,7 +12424,7 @@ void daPy_lk_c::playerInit() {
         // Modify the linktexS3TC texture in Link's model to be the casual clothes texture.
         texture->setResTIMG(i, *linktex_casual);
         
-        if (!dComIfGs_isEventBit(0x2A80) || dComIfGs_getClearCount() != 0) {
+        if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2A80) || dComIfGs_getClearCount() != 0) {
             onNoResetFlg1(daPyFlg1_CASUAL_CLOTHES);
         }
         if (checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES)) {
@@ -12543,7 +12543,7 @@ cPhs_State daPy_lk_c::makeBgWait() {
           (!strcmp(dComIfGp_getStartStageName(), "Siren") && fopAcM_GetRoomNo(this) == 0 && current.pos.z > 1400.0f &&
            current.pos.x < 400.0f && current.pos.x > -400.0f))))
     {
-        if (!dComIfGs_isEventBit(0xf80)) {
+        if (!dComIfGs_isEventBit(dSv_event_flag_c::MET_KORL)) {
             if (changeSwimProc()) {
                 procSwimWait_init(0);
                 m34C2 = 0;
@@ -12556,9 +12556,9 @@ cPhs_State daPy_lk_c::makeBgWait() {
                 return cPhs_INIT_e;
             }
 #if VERSION > VERSION_JPN
-            if (dComIfGs_isEventBit(0x3e10)) {
-                dComIfGs_onEventBit(0x3e01);
-                dComIfGs_onEventBit(0x3f80);
+            if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E10)) {
+                dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E01);
+                dComIfGs_onEventBit(dSv_event_flag_c::UNK_3F80);
             }
 #endif
             s16 sVar6;