mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-07 10:11:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2392 from gymnast86/charlo-fix

Browse Source 
ItemService: Fix prayer_reward check
This commit is contained in:
TakaRikka
2026-09-04 22:30:16 -07:00
committed by GitHub
parent 68ed663905 cf1859f754
commit 58c31d304c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink_demo.inc
+1 -1
View File
@@ -2387,7 +2387,7 @@ int daAlink_c::procCoGetItemInit() {
if (var_r31 != 0) {
mProcVar3.field_0x300e = -0x8000;
mProcVar4.field_0x3010 = 1;
} else if (mDemo.getParam1() == 2) {
} else if (mDemo.getParam1() == DUSK_IF_ELSE(dusk::mods::item_give_tag("prayer_reward"), 2)) {
mProcVar3.field_0x300e = 0;
} else {
mProcVar3.field_0x300e = shape_angle.y - (fopCamM_GetAngleY(dComIfGp_getCamera(field_0x317c)) + 0x8000);
src/d/d_event_manager.cpp
+4 -1
View File
@@ -339,10 +339,13 @@ bool dEvent_manager_c::setObjectArchive(DUSK_CONST char* arcname) {
rt = dComIfG_getObjectRes(arcname, DataFileName);
#if TARGET_PC
if (rt != nullptr && strcmp(arcname, "Prayer") == 0) {
// pointer to Prayer event `011get_item` prm0 in it's event_list.dat
// pointer to Prayer event `011get_item` prm0 in its event_list.dat
u8* itemNo = static_cast<u8*>(rt) + 0x927;
*itemNo =
dusk::mods::item_check("prayer_reward", dItemNo_KAKERA_HEART_e, NULL);
// set the proper item give tag
u32* prm1 = reinterpret_cast<u32*>(static_cast<u8*>(rt) + 0x928);
*prm1 = dusk::mods::item_give_tag("prayer_reward");
}
#endif
int base_status = mEventList[BASE_ACTOR].init((char*)rt, -1);