diff --git a/include/m_event.h b/include/m_event.h index 47895eb0..19611a67 100644 --- a/include/m_event.h +++ b/include/m_event.h @@ -364,7 +364,7 @@ typedef struct ghost_spirit_block_data_s { } mEv_gst_hitodama_block_c; #define mEv_GHOST_FLAG_ACTIVE 0x4000 // TODO: do these live in the ghost actor itself? -#define mEv_GHOST_FLAG_HITODAMA_EXIST 0x8000 +#define mEv_GHOST_FLAG_RETURNED_SPIRITS 0x8000 typedef struct ghost_common_s { mEv_gst_hitodama_block_c hitodama_block_data; u16 flags; diff --git a/src/ac_ev_ghost.c b/src/ac_ev_ghost.c index 6930e3e3..1978d4b1 100644 --- a/src/ac_ev_ghost.c +++ b/src/ac_ev_ghost.c @@ -148,7 +148,7 @@ static void aEGH_actor_ct(ACTOR* actorx, GAME* game) { mTM_set_renew_time(&ghost_save->renew_time, rtc_time); } - if ((ghost_save->flags & mEv_GHOST_FLAG_HITODAMA_EXIST) != 0) { + if ((ghost_save->flags & mEv_GHOST_FLAG_RETURNED_SPIRITS) != 0) { Actor_delete(actorx); } } diff --git a/src/ac_ev_ghost_talk.c_inc b/src/ac_ev_ghost_talk.c_inc index 6d84157d..62c1e568 100644 --- a/src/ac_ev_ghost_talk.c_inc +++ b/src/ac_ev_ghost_talk.c_inc @@ -375,7 +375,7 @@ static void aEGH_select_wait(EV_GHOST_ACTOR* ghost, GAME_PLAY* play) { if (order == 1 && mMsg_Check_MainNormalContinue(mMsg_Get_base_window_p())) { ghost->after_talk_think_act = 1; - ghost_data->flags |= 0x8000; + ghost_data->flags |= mEv_GHOST_FLAG_RETURNED_SPIRITS; mDemo_Set_OrderValue(mDemo_ORDER_NPC0, 9, 0); switch (mChoice_Get_ChoseNum(mChoice_Get_base_window_p())) {