From 42b34a740f5b9c3aafa702f2eb3b7f60a36d7796 Mon Sep 17 00:00:00 2001
From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com>
Date: Sat, 30 May 2026 21:06:45 -0400
Subject: [PATCH] dComIfGp_event_reset Uses

- Fix a few cases where this wasn't being used properly
---
 src/d/actor/d_a_npc_rsh1.cpp | 6 +++---
 src/d/actor/d_a_oship.cpp    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp
index abdce13d9..e57cbd671 100644
--- a/src/d/actor/d_a_npc_rsh1.cpp
+++ b/src/d/actor/d_a_npc_rsh1.cpp
@@ -1317,7 +1317,7 @@ bool daNpc_Rsh1_c::talk01() {
     if (result == fopMsgStts_BOX_CLOSED_e) {
         daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
         m95C = m95D;
-        dComIfGp_event_onEventFlag(dSv_event_flag_c::UNK_0008);
+        dComIfGp_event_reset();
         mShopCamAct.Reset();
         link_p->offNoResetFlg0(daPy_py_c::daPyFlg0_NO_DRAW);
         m771 = false;
@@ -1369,7 +1369,7 @@ BOOL daNpc_Rsh1_c::getdemo_action(void* i_unusedP) {
         dComIfGp_evmng_cutEnd(staff_idx);
         if (dComIfGp_evmng_endCheck("RSH_GET_DEMO")) {
             m95B = 1;
-            dComIfGp_event_onEventFlag(dSv_event_flag_c::UNK_0008);
+            dComIfGp_event_reset();
 
             if (mItemNo == dItemNo_TOWN_FLOWER_e) {
                 m780 = 0x2857;
@@ -1634,7 +1634,7 @@ BOOL daNpc_Rsh1_c::event_action(void* i_unusedP) {
             if (cLib_checkBit<u32>(actor_status, fopAcStts_UNK4000_e)) {
                 cLib_offBit<u32>(actor_status, fopAcStts_UNK4000_e);
             }
-            dComIfGp_event_onEventFlag(dSv_event_flag_c::UNK_0008);
+            dComIfGp_event_reset();
             setAction(&daNpc_Rsh1_c::wait_action, NULL);
         }
         lookBack();
diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp
index 23951810a..d89f35195 100644
--- a/src/d/actor/d_a_oship.cpp
+++ b/src/d/actor/d_a_oship.cpp
@@ -731,7 +731,7 @@ void daOship_c::modeDelete() {
 #if VERSION > VERSION_DEMO
                 dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E80);
 #endif
-                dComIfGp_event_onEventFlag(8);
+                dComIfGp_event_reset();
                 fopAcM_delete(this);
             }
         } else {