mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-12 03:17:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

standardize some check names

Browse Source
This commit is contained in:
TakaRikka
2026-08-10 12:35:08 -07:00
parent 71b2eedc82
commit 0c3bbbaba0
30 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_rdb.cpp
+1 -1
View File
@@ -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;
src/d/actor/d_a_e_th_ball.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_npc_aru.cpp
+2 -2
View File
@@ -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(&current.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)) {
src/d/actor/d_a_npc_ashB.cpp
+2 -2
View File
@@ -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(
&current.pos, local_30[0], 0, -1, -1, 0, 0 DUSK_GIVE_TAG("Ashei Sketch"));
&current.pos, local_30[0], 0, -1, -1, 0, 0 DUSK_GIVE_TAG("ashei_sketch"));
dComIfGp_event_setItemPartnerId(mItemPartnerId);
mItemPartnerId = -1;
}
src/d/actor/d_a_npc_chin.cpp
+2 -2
View File
@@ -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);
src/d/actor/d_a_npc_fairy.cpp
+2 -2
View File
@@ -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(&current.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);
}
src/d/actor/d_a_npc_gra.cpp
+1 -1
View File
@@ -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
src/d/actor/d_a_npc_gro.cpp
+2 -2
View File
@@ -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(&current.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);
src/d/actor/d_a_npc_grr.cpp
+2 -2
View File
@@ -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(&current.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);
src/d/actor/d_a_npc_grs.cpp
+2 -2
View File
@@ -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(&current.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 =
src/d/actor/d_a_npc_impal.cpp
+4 -4
View File
@@ -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(
&current.pos, evt_id, 0, -1, -1, 0, 0 DUSK_GIVE_TAG("Ilia Charm"));
&current.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(
&current.pos, evt_id, 0, -1, -1, 0, 0 DUSK_GIVE_TAG("Skybook From Impaz"));
&current.pos, evt_id, 0, -1, -1, 0, 0 DUSK_GIVE_TAG("skybook"));
dComIfGp_event_setItemPartnerId(mItemPartnerId);
mItemPartnerId = -1;
}
src/d/actor/d_a_npc_kkri.cpp
+1 -1
View File
@@ -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
src/d/actor/d_a_npc_len.cpp
+2 -2
View File
@@ -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(&current.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;
src/d/actor/d_a_npc_maro.cpp
+2 -2
View File
@@ -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(&current.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)) {
src/d/actor/d_a_npc_myna2.cpp
+1 -1
View File
@@ -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
src/d/actor/d_a_npc_pouya.cpp
+2 -2
View File
@@ -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);
src/d/actor/d_a_npc_prayer.cpp
+1 -1
View File
@@ -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) {
src/d/actor/d_a_npc_rafrel.cpp
+4 -4
View File
@@ -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(&current.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(
&current.pos, itemNo, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("Auru Gift To Fyer"));
&current.pos, itemNo, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("auru_memo"));
dComIfGp_event_setItemPartnerId(field_0xe00);
field_0xe00 = fpcM_ERROR_PROCESS_ID_e;
}
src/d/actor/d_a_npc_the.cpp
+2 -2
View File
@@ -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(&current.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);
src/d/actor/d_a_npc_uri.cpp
+2 -2
View File
@@ -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(&current.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 */
src/d/actor/d_a_npc_ykw.cpp
+4 -4
View File
@@ -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(&current.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(&current.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)) {
src/d/actor/d_a_npc_zra.inc
+2 -2
View File
@@ -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);
src/d/actor/d_a_npc_zrc.cpp
+2 -2
View File
@@ -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(
&current.pos, item_no, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("Gift From Ralis"));
&current.pos, item_no, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("coral_earring"));
}
break;
}
src/d/actor/d_a_npc_zrz.cpp
+2 -2
View File
@@ -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(
&current.pos, item_no, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("Rutelas Blessing"));
&current.pos, item_no, 0, -1, -1, NULL, NULL DUSK_GIVE_TAG("zora_armor"));
}
break;
src/d/actor/d_a_obj_shield.cpp
+3 -3
View File
@@ -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(&current.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;
src/d/actor/d_a_obj_sword.cpp
+3 -3
View File
@@ -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(&current.pos, DUSK_ITEM_CHECK_EXPR("Ordon Sword", 0x28, this),
-1, fopAcM_GetRoomNo(this), NULL, NULL DUSK_GIVE_TAG("Ordon Sword"));
fopAcM_createItemForTrBoxDemo(&current.pos, DUSK_ITEM_CHECK_EXPR("ordon_sword", 0x28, this),
-1, fopAcM_GetRoomNo(this), NULL, NULL DUSK_GIVE_TAG("ordon_sword"));
setStatus(1);
return 1;
}
src/d/actor/d_a_obj_wood_statue.cpp
+2 -2
View File
@@ -256,8 +256,8 @@ int daObjWStatue_c::initActionOrderGetDemo() {
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, eventIdx, 1, 0xffff);
mItemId = fopAcM_createItemForTrBoxDemo(&current.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;
src/d/actor/d_a_obj_zcloth.cpp
+1 -1
View File
@@ -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)) {
src/d/d_event_manager.cpp
+1 -1
View File
@@ -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<u8*>(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);
src/d/d_shop_system.cpp
+1 -1
View File
@@ -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