From 0c3bbbaba03fc5b043aafda0838c24cce17d4e94 Mon Sep 17 00:00:00 2001 From: TakaRikka Date: Mon, 10 Aug 2026 12:35:08 -0700 Subject: [PATCH] standardize some check names --- src/d/actor/d_a_e_rdb.cpp | 2 +- src/d/actor/d_a_e_th_ball.cpp | 4 ++-- src/d/actor/d_a_npc_aru.cpp | 4 ++-- src/d/actor/d_a_npc_ashB.cpp | 4 ++-- src/d/actor/d_a_npc_chin.cpp | 4 ++-- src/d/actor/d_a_npc_fairy.cpp | 4 ++-- src/d/actor/d_a_npc_gra.cpp | 2 +- src/d/actor/d_a_npc_gro.cpp | 4 ++-- src/d/actor/d_a_npc_grr.cpp | 4 ++-- src/d/actor/d_a_npc_grs.cpp | 4 ++-- src/d/actor/d_a_npc_impal.cpp | 8 ++++---- src/d/actor/d_a_npc_kkri.cpp | 2 +- src/d/actor/d_a_npc_len.cpp | 4 ++-- src/d/actor/d_a_npc_maro.cpp | 4 ++-- src/d/actor/d_a_npc_myna2.cpp | 2 +- src/d/actor/d_a_npc_pouya.cpp | 4 ++-- src/d/actor/d_a_npc_prayer.cpp | 2 +- src/d/actor/d_a_npc_rafrel.cpp | 8 ++++---- src/d/actor/d_a_npc_the.cpp | 4 ++-- src/d/actor/d_a_npc_uri.cpp | 4 ++-- src/d/actor/d_a_npc_ykw.cpp | 8 ++++---- src/d/actor/d_a_npc_zra.inc | 4 ++-- src/d/actor/d_a_npc_zrc.cpp | 4 ++-- src/d/actor/d_a_npc_zrz.cpp | 4 ++-- src/d/actor/d_a_obj_shield.cpp | 6 +++--- src/d/actor/d_a_obj_sword.cpp | 6 +++--- src/d/actor/d_a_obj_wood_statue.cpp | 4 ++-- src/d/actor/d_a_obj_zcloth.cpp | 2 +- src/d/d_event_manager.cpp | 2 +- src/d/d_shop_system.cpp | 2 +- 30 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index ed0459432f..c467f38fd6 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1251,7 +1251,7 @@ static void demo_camera(e_rdb_class* i_this) { if (iVar1 != 0) { daPy_getPlayerActorClass()->changeDemoMode(11, - DUSK_ITEM_CHECK_EXPR("Hyrule Castle King Bulblin Key", dItemNo_SMALL_KEY_e, &i_this->enemy), 0, + DUSK_ITEM_CHECK_EXPR("bulblin_key:D_MN09", dItemNo_SMALL_KEY_e, &i_this->enemy), 0, 0); i_this->mDemoMode = 12; i_this->field_0x10aa = 0; diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index 4a4c322cd1..fcb87ada24 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -932,8 +932,8 @@ static void get_demo(e_th_ball_class* i_this) { break; case 1: demo_id = fopAcM_createItemForTrBoxDemo(&i_this->current.pos, - DUSK_ITEM_CHECK_EXPR("Snowpeak Ruins Ball and Chain", dItemNo_IRONBALL_e, i_this), -1, - fopAcM_GetRoomNo(i_this), NULL, NULL DUSK_GIVE_TAG("Snowpeak Ruins Ball and Chain")); + DUSK_ITEM_CHECK_EXPR("ball_and_chain:D_MN11", dItemNo_IRONBALL_e, i_this), -1, + fopAcM_GetRoomNo(i_this), NULL, NULL DUSK_GIVE_TAG("ball_and_chain:D_MN11")); JUT_ASSERT(1670, demo_id != fpcM_ERROR_PROCESS_ID_e); i_this->mDemoMode = 2; break; diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 9d9356a698..5b6444123c 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -1744,9 +1744,9 @@ int daNpc_Aru_c::cutSpeakTo(int i_staffID) { switch (eventId) { case 1: if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { - DUSK_ITEM_CHECK("Herding Goats Reward", itemNo, this); + DUSK_ITEM_CHECK("goats_reward", itemNo, this); mItemPartnerId = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, - 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("Herding Goats Reward")); + 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("goats_reward")); } if (fopAcM_IsExecuting(mItemPartnerId)) { diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 29e349ba55..f9c7df2cc2 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -1001,9 +1001,9 @@ BOOL daNpcAshB_c::EvCut_Appear(int i_staffID) { case '0008': local_30[0] = 0; if (mFlow.getEventId(local_30) == 1) { - DUSK_ITEM_CHECK("Ashei Sketch", local_30[0], this); + DUSK_ITEM_CHECK("ashei_sketch", local_30[0], this); mItemPartnerId = fopAcM_createItemForPresentDemo( - ¤t.pos, local_30[0], 0, -1, -1, 0, 0 DUSK_GIVE_TAG("Ashei Sketch")); + ¤t.pos, local_30[0], 0, -1, -1, 0, 0 DUSK_GIVE_TAG("ashei_sketch")); dComIfGp_event_setItemPartnerId(mItemPartnerId); mItemPartnerId = -1; } diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 826cb27b53..fb91bd79d8 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -1807,9 +1807,9 @@ int daNpcChin_c::_Evt_GameSucceed_CutMain(const int& param_0) { #if TARGET_PC const char* itemCheckName = nullptr; if (itemId1 == dItemNo_ARROW_LV2_e) { - itemCheckName = "STAR Prize 1"; + itemCheckName = "star_reward_1"; } else if (itemId1 == dItemNo_ARROW_LV3_e) { - itemCheckName = "STAR Prize 2"; + itemCheckName = "star_reward_2"; } if (itemCheckName != nullptr) { itemId1 = dusk::mods::item_check(itemCheckName, itemId1, this); diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index 62d5367708..0b911973e4 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -1333,9 +1333,9 @@ void daNpc_Fairy_c::PresentDemoCall() { item_no = 0; } - DUSK_ITEM_CHECK("Cave of Ordeals Great Fairy Reward", item_no, this); + DUSK_ITEM_CHECK("fairy_reward:D_SB01", item_no, this); fpc_ProcID id = fopAcM_createItemForPresentDemo(¤t.pos, item_no, 0, -1, -1, NULL, - NULL DUSK_GIVE_TAG("Cave of Ordeals Great Fairy Reward")); + NULL DUSK_GIVE_TAG("fairy_reward:D_SB01")); if (id != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(id); } diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index ab0ce4aae8..4300348ff9 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -4021,7 +4021,7 @@ BOOL daNpc_grA_c::talk(void*) { #if TARGET_PC const char* itemCheckName = nullptr; if (sp8 == dItemNo_BOMB_IN_BAG_e) { - itemCheckName = "Zoras Domain Underwater Goron"; + itemCheckName = "goron_reward:F_SP113"; sp8 = dusk::mods::item_check(itemCheckName, sp8, this); } #endif diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index bb9ec6068c..e1b9e457de 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -1681,9 +1681,9 @@ int daNpc_grO_c::talk(void* param_1) { if (facePlayerFlag && talkProc(NULL, TRUE, NULL)) { if (mType == TYPE_MINES) { if (mFlow.getEventId(&itemId) == 1) { - DUSK_ITEM_CHECK("Goron Mines Gor Ebizo Key Shard", itemId, this); + DUSK_ITEM_CHECK("key_shard_2:D_MN04", itemId, this); mItemID = fopAcM_createItemForPresentDemo(¤t.pos, itemId, 0, -1, -1, - NULL, NULL DUSK_GIVE_TAG("Goron Mines Gor Ebizo Key Shard")); + NULL, NULL DUSK_GIVE_TAG("key_shard_2:D_MN04")); if (mItemID != fpcM_ERROR_PROCESS_ID_e) { s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); dComIfGp_getEvent()->reset(this); diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 529686bf05..4a978c586e 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -1338,9 +1338,9 @@ int daNpc_grR_c::talk(void* param_1) { if (bVar1 && talkProc(NULL, TRUE, NULL)) { if (mType == TYPE_0) { if (mFlow.getEventId(&i_itemNo) == 1) { - DUSK_ITEM_CHECK("Goron Mines Gor Liggs Key Shard", i_itemNo, this); + DUSK_ITEM_CHECK("key_shard_3:D_MN04", i_itemNo, this); mItemID = fopAcM_createItemForPresentDemo(¤t.pos, i_itemNo, 0, -1, -1, - NULL, NULL DUSK_GIVE_TAG("Goron Mines Gor Liggs Key Shard")); + NULL, NULL DUSK_GIVE_TAG("key_shard_3:D_MN04")); if (mItemID != fpcM_ERROR_PROCESS_ID_e) { s16 i_eventID = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 9b3a08f432..462f77b8a7 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -1190,9 +1190,9 @@ int daNpc_grS_c::talk(void* param_0) { if (unkFlag1 && talkProc(NULL, 1, NULL)) { if (mType == 0) { if (mFlow.getEventId(&unkInt2) == 1) { - DUSK_ITEM_CHECK("Goron Mines Gor Amato Key Shard", unkInt2, this); + DUSK_ITEM_CHECK("key_shard_1:D_MN04", unkInt2, this); mPresentItemId = fopAcM_createItemForPresentDemo(¤t.pos, unkInt2, 0, -1, - -1, 0, 0 DUSK_GIVE_TAG("Goron Mines Gor Amato Key Shard")); + -1, 0, 0 DUSK_GIVE_TAG("key_shard_1:D_MN04")); if (mPresentItemId != fpcM_ERROR_PROCESS_ID_e) { s16 eventIdx = diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 3d483a1bd9..171c36c289 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -971,9 +971,9 @@ BOOL daNpcImpal_c::EvCut_ImpalAppear1(int i_cut_index) { if (talkProc(NULL, 1, NULL)) { int evt_id = 0; if (mFlow.getEventId(&evt_id) == 1) { - DUSK_ITEM_CHECK("Ilia Charm", evt_id, this); + DUSK_ITEM_CHECK("ilia_charm", evt_id, this); mItemPartnerId = fopAcM_createItemForPresentDemo( - ¤t.pos, evt_id, 0, -1, -1, 0, 0 DUSK_GIVE_TAG("Ilia Charm")); + ¤t.pos, evt_id, 0, -1, -1, 0, 0 DUSK_GIVE_TAG("ilia_charm")); if (mItemPartnerId != 0xffffffff) { s16 evt_idx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff); @@ -1061,9 +1061,9 @@ BOOL daNpcImpal_c::EvCut_CopyRod(int i_cut_index) { case '0003': int evt_id = 0; if (mFlow.getEventId(&evt_id) == 1) { - DUSK_ITEM_CHECK("Skybook From Impaz", evt_id, this); + DUSK_ITEM_CHECK("skybook", evt_id, this); mItemPartnerId = fopAcM_createItemForPresentDemo( - ¤t.pos, evt_id, 0, -1, -1, 0, 0 DUSK_GIVE_TAG("Skybook From Impaz")); + ¤t.pos, evt_id, 0, -1, -1, 0, 0 DUSK_GIVE_TAG("skybook")); dComIfGp_event_setItemPartnerId(mItemPartnerId); mItemPartnerId = -1; } diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 55e0e551c4..4d9c882d03 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -1184,7 +1184,7 @@ int daNpc_Kkri_c::talk(void*) { #if TARGET_PC const char* itemCheckName = nullptr; if (item_no == dItemNo_OIL_BOTTLE3_e) { - itemCheckName = "Coro Bottle"; + itemCheckName = "coro_bottle"; item_no = dusk::mods::item_check(itemCheckName, item_no, this); } #endif diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 1e3ce2c1c1..2568462e8b 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -1236,9 +1236,9 @@ int daNpc_Len_c::talk(void* param_0) { switch (evt_id) { case 1: if (mItemPartnerId == -1) { - DUSK_ITEM_CHECK("Renados Letter", local_18, this); + DUSK_ITEM_CHECK("renado_letter", local_18, this); mItemPartnerId = fopAcM_createItemForPresentDemo(¤t.pos, local_18, - 0, -1, -1, 0, 0 DUSK_GIVE_TAG("Renados Letter")); + 0, -1, -1, 0, 0 DUSK_GIVE_TAG("renado_letter")); } if (fopAcM_IsExecuting(mItemPartnerId)) { mEvtNo = 1; diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 7b538e8514..d985349a48 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -2393,10 +2393,10 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { switch (evt_ret) { case 1: { if (mItemPartnerId == -1) { - DUSK_ITEM_CHECK("Talo Sharpshooting", evt_id, this); + DUSK_ITEM_CHECK("archery_reward:F_SP109", evt_id, this); mItemPartnerId = fopAcM_createItemForPresentDemo(¤t.pos, evt_id, 0, -1, -1, - NULL, NULL DUSK_GIVE_TAG("Talo Sharpshooting")); + NULL, NULL DUSK_GIVE_TAG("archery_reward:F_SP109")); } if (fopAcM_IsExecuting(mItemPartnerId)) { diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index b7c3ea1eaa..faa5301bb8 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -1194,7 +1194,7 @@ int daNpc_myna2_c::ECut_gameGoalSuccess(int i_staffId) { #if TARGET_PC const char* itemCheckName = nullptr; if (itemNo == dItemNo_KAKERA_HEART_e) { - itemCheckName = "Plumm Fruit Balloon Minigame"; + itemCheckName = "plumm_minigame_reward"; itemNo = dusk::mods::item_check(itemCheckName, itemNo, this); } #endif diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index d7ad2036f9..6101b64a93 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -961,9 +961,9 @@ int daNpc_Pouya_c::cutHaveFavorToAsk(int param_0) { #if TARGET_PC const char* itemCheckName = nullptr; if (local_64 == dItemNo_DROP_BOTTLE_e) { - itemCheckName = "Jovani 20 Poe Soul Reward"; + itemCheckName = "jovani_reward_1"; } else if (local_64 == dItemNo_SILVER_RUPEE_e) { - itemCheckName = "Jovani 60 Poe Soul Reward"; + itemCheckName = "jovani_reward_2"; } if (itemCheckName != nullptr) { local_64 = dusk::mods::item_check(itemCheckName, local_64, this); diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index e27eba137e..1e10121f56 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -721,7 +721,7 @@ fpc_ProcID daNpcPray_c::createHeart() { mDoMtx_stack_c::multVec(&offset, &offset); pos += offset; return fopAcM_createItemForBoss(&pos, dItemNo_KAKERA_HEART_e, fopAcM_GetRoomNo(this), &rot, - &size, 0.0f, 0.0f, 0 IF_DUSK_ARG("Charlo Donation Blessing")); + &size, 0.0f, 0.0f, 0 IF_DUSK_ARG("prayer_reward")); } BOOL daNpcPray_c::_Evt_GetHeart(int i_staffID) { diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index ca2cc7ede3..d51d514785 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -1310,9 +1310,9 @@ bool daNpcRafrel_c::talk(void* param_0) { OS_REPORT("会話終了時 イベントID=%d アイテムNo=%d\n", eventId, itemNo); if (eventId == 1) { - DUSK_ITEM_CHECK("Auru Gift To Fyer", itemNo, this); + DUSK_ITEM_CHECK("auru_memo", itemNo, this); field_0xe00 = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, -1, - NULL, NULL DUSK_GIVE_TAG("Auru Gift To Fyer")); + NULL, NULL DUSK_GIVE_TAG("auru_memo")); if (field_0xe00 != fpcM_ERROR_PROCESS_ID_e) { s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); dComIfGp_getEvent()->reset(this); @@ -1564,9 +1564,9 @@ int daNpcRafrel_c::EvCut_Appear(int i_staffId) { int itemNo = 0; u16 eventId = mFlow.getEventId(&itemNo); if (eventId == 1) { - DUSK_ITEM_CHECK("Auru Gift To Fyer", itemNo, this); + DUSK_ITEM_CHECK("auru_memo", itemNo, this); field_0xe00 = fopAcM_createItemForPresentDemo( - ¤t.pos, itemNo, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("Auru Gift To Fyer")); + ¤t.pos, itemNo, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("auru_memo")); dComIfGp_event_setItemPartnerId(field_0xe00); field_0xe00 = fpcM_ERROR_PROCESS_ID_e; } diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 8e113a33aa..7291e14715 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -823,9 +823,9 @@ BOOL daNpcThe_c::talk(void* param_0) { } int item_no = 0; if (mFlow.getEventId(&item_no) == 1) { - DUSK_ITEM_CHECK("Telma Invoice", item_no, this); + DUSK_ITEM_CHECK("telma_invoice", item_no, this); mItemID = fopAcM_createItemForPresentDemo(¤t.pos, item_no, 0, -1, -1, - NULL, NULL DUSK_GIVE_TAG("Telma Invoice")); + NULL, NULL DUSK_GIVE_TAG("telma_invoice")); if (mItemID != -1) { s16 event_id = dComIfGp_getEventManager().getEventIdx( this, "DEFAULT_GETITEM", 0xff); diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index aed64d4c3a..afb1d11b1b 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -1165,9 +1165,9 @@ int daNpc_Uri_c::cutEndCarryTutorial(int param_1) { (s32)mFlow.getEventId(&local_48) == 1) { if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { - DUSK_ITEM_CHECK("Uli Cradle Delivery", local_48, this); + DUSK_ITEM_CHECK("uli_cradle_reward", local_48, this); mItemPartnerId = fopAcM_createItemForPresentDemo(¤t.pos, local_48, 0, -1, -1, - NULL, NULL DUSK_GIVE_TAG("Uli Cradle Delivery")); + NULL, NULL DUSK_GIVE_TAG("uli_cradle_reward")); } if (fopAcM_IsExecuting(mItemPartnerId)) { /* T_0007 - Ordon Village - During Uli's pick-up tutorial */ diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 38d7bdb412..7b84e1a1bb 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -2213,9 +2213,9 @@ int daNpc_ykW_c::cutEndSnowboardRace(int param_0) { switch (eventId) { case 1: if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { - DUSK_ITEM_CHECK("Snowboard Racing Prize", itemId, this); + DUSK_ITEM_CHECK("snowboard_race_reward", itemId, this); mItemPartnerId = fopAcM_createItemForPresentDemo(¤t.pos, itemId, 0, -1, - -1, 0, 0 DUSK_GIVE_TAG("Snowboard Racing Prize")); + -1, 0, 0 DUSK_GIVE_TAG("snowboard_race_reward")); } if (fopAcM_IsExecuting(mItemPartnerId)) { @@ -2912,9 +2912,9 @@ int daNpc_ykW_c::talk(void* param_0) { switch (eventId) { case 1: if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { - DUSK_ITEM_CHECK("Snowpeak Ruins Mansion Map", itemNo, this); + DUSK_ITEM_CHECK("dungeon_map:D_MN11", itemNo, this); mItemPartnerId = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, - 0, -1, -1, 0, 0 DUSK_GIVE_TAG("Snowpeak Ruins Mansion Map")); + 0, -1, -1, 0, 0 DUSK_GIVE_TAG("dungeon_map:D_MN11")); } if (fopAcM_IsExecuting(mItemPartnerId)) { diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc index 3846051bbe..70426d5f99 100644 --- a/src/d/actor/d_a_npc_zra.inc +++ b/src/d/actor/d_a_npc_zra.inc @@ -2612,9 +2612,9 @@ BOOL daNpc_zrA_c::ECut_thanksBlast(int i_staffID) { #if TARGET_PC const char* itemCheckName = nullptr; if (item_id == dItemNo_BOMB_IN_BAG_e) { - itemCheckName = "Iza Helping Hand"; + itemCheckName = "iza_reward_1"; } else if (item_id == dItemNo_BOMB_BAG_LV2_e) { - itemCheckName = "Iza Raging Rapids Minigame"; + itemCheckName = "iza_reward_2"; } if (itemCheckName != nullptr) { item_id = dusk::mods::item_check(itemCheckName, item_id, this); diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index b800d13f80..f94dbaf087 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -1681,9 +1681,9 @@ BOOL daNpc_zrC_c::ECut_earringGet(int i_staffID) { case 40: { int item_no = 0; if (mFlow.getEventId(&item_no) == 1) { - DUSK_ITEM_CHECK("Gift From Ralis", item_no, this); + DUSK_ITEM_CHECK("coral_earring", item_no, this); mItemID = fopAcM_createItemForPresentDemo( - ¤t.pos, item_no, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("Gift From Ralis")); + ¤t.pos, item_no, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("coral_earring")); } break; } diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index 62312a5b81..0662a290cd 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -1729,9 +1729,9 @@ BOOL daNpc_zrZ_c::ECut_clothesGet(int i_staffID) { } item_no = 0; if (mFlow.getEventId(&item_no) == 1) { - DUSK_ITEM_CHECK("Rutelas Blessing", item_no, this); + DUSK_ITEM_CHECK("zora_armor", item_no, this); mItemID = fopAcM_createItemForPresentDemo( - ¤t.pos, item_no, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("Rutelas Blessing")); + ¤t.pos, item_no, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("zora_armor")); } break; diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index aad1594107..abe56ad6c8 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -109,7 +109,7 @@ int daItemShield_c::__CreateHeap() { int daItemShield_c::create() { fopAcM_ct(this, daItemShield_c); m_itemNo = dItemNo_WOOD_SHIELD_e; - DUSK_ITEM_CHECK("Ordon Shield", m_itemNo, this); + DUSK_ITEM_CHECK("ordon_shield", m_itemNo, this); if (fopAcM_isSwitch(this, getSwBit2())) { OS_REPORT("木の盾：もう取ったので出ません\n"); return cPhs_ERROR_e; @@ -242,8 +242,8 @@ int daItemShield_c::initActionOrderGetDemo() { fopAcM_orderItemEvent(this, 0, 0); eventInfo.onCondition(dEvtCnd_CANGETITEM_e); mItemId = fopAcM_createItemForTrBoxDemo(¤t.pos, - DUSK_ITEM_CHECK_EXPR("Ordon Shield", dItemNo_WOOD_SHIELD_e, this), -1, - fopAcM_GetRoomNo(this), 0, 0 DUSK_GIVE_TAG("Ordon Shield")); + DUSK_ITEM_CHECK_EXPR("ordon_shield", dItemNo_WOOD_SHIELD_e, this), -1, + fopAcM_GetRoomNo(this), 0, 0 DUSK_GIVE_TAG("ordon_shield")); JUT_ASSERT(682, mItemId != fpcM_ERROR_PROCESS_ID_e) setStatus(STATUS_ORDERGETDEMO); return 1; diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index c393edb33b..d7bf0cfaab 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -37,7 +37,7 @@ int daObjSword_c::Create() { cPhs_Step daObjSword_c::create() { fopAcM_ct(this, daObjSword_c); m_itemNo = 0x28; - DUSK_ITEM_CHECK("Ordon Sword", m_itemNo, this); + DUSK_ITEM_CHECK("ordon_sword", m_itemNo, this); if (fopAcM_isItem(this, getItemBit())) { return cPhs_ERROR_e; } @@ -73,8 +73,8 @@ int daObjSword_c::initActionOrderGetDemo() { fopAcM_orderItemEvent(this, 0, 0); eventInfo.onCondition(8); mProcID = - fopAcM_createItemForTrBoxDemo(¤t.pos, DUSK_ITEM_CHECK_EXPR("Ordon Sword", 0x28, this), - -1, fopAcM_GetRoomNo(this), NULL, NULL DUSK_GIVE_TAG("Ordon Sword")); + fopAcM_createItemForTrBoxDemo(¤t.pos, DUSK_ITEM_CHECK_EXPR("ordon_sword", 0x28, this), + -1, fopAcM_GetRoomNo(this), NULL, NULL DUSK_GIVE_TAG("ordon_sword")); setStatus(1); return 1; } diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 626f36adae..9656036235 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -256,8 +256,8 @@ int daObjWStatue_c::initActionOrderGetDemo() { dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xffff); mItemId = fopAcM_createItemForTrBoxDemo(¤t.pos, - DUSK_ITEM_CHECK_EXPR("Wooden Statue", m_itemNo, this), 0xffffffff, fopAcM_GetRoomNo(this), - 0, 0 DUSK_GIVE_TAG("Wooden Statue")); + DUSK_ITEM_CHECK_EXPR("wood_statue", m_itemNo, this), 0xffffffff, fopAcM_GetRoomNo(this), + 0, 0 DUSK_GIVE_TAG("wood_statue")); JUT_ASSERT(544, mItemId != fpcM_ERROR_PROCESS_ID_e); setStatus(STATUS_ORDER_GET_DEMO); return 1; diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index 46561b2471..7d9ca8fc51 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -32,7 +32,7 @@ int daObjZCloth_c::Create() { int daObjZCloth_c::create() { fopAcM_ct(this, daObjZCloth_c); m_itemNo = 0x31; - DUSK_ITEM_CHECK("Rutelas Blessing", m_itemNo, this); + DUSK_ITEM_CHECK("zora_armor", m_itemNo, this); int phase = dComIfG_resLoad(&mPhase, dItem_data::getFieldArc(m_itemNo)); if (phase == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckFieldItemCreateHeap, 0x2fb0)) { diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 28464aceaf..da50ec7d96 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -340,7 +340,7 @@ bool dEvent_manager_c::setObjectArchive(DUSK_CONST char* arcname) { // pointer to Prayer event `011get_item` prm0 in it's event_list.dat u8* itemNo = static_cast(rt) + 0x927; *itemNo = - dusk::mods::item_check("Charlo Donation Blessing", dItemNo_KAKERA_HEART_e, NULL); + dusk::mods::item_check("prayer_reward", dItemNo_KAKERA_HEART_e, NULL); } #endif int base_status = mEventList[BASE_ACTOR].init((char*)rt, -1); diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index d15004b656..bf2d3650af 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -908,7 +908,7 @@ int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* i_flow) { #if TARGET_PC const char* itemCheckName = nullptr; if (itemNo == dItemNo_HALF_MILK_BOTTLE_e) { - itemCheckName = "Ordon Cat Rescue"; + itemCheckName = "sera_reward"; itemNo = dusk::mods::item_check(itemCheckName, itemNo, actor); } #endif