Skip to content

d_a_npc_zant work#2354

Merged
hatal175 merged 4 commits intozeldaret:mainfrom
carter-ktb21:d_a_npc_zant
Mar 31, 2025
Merged

d_a_npc_zant work#2354
hatal175 merged 4 commits intozeldaret:mainfrom
carter-ktb21:d_a_npc_zant

Conversation

@carter-ktb21
Copy link
Copy Markdown
Contributor

No description provided.

Comment on lines +103 to +107
if (rv == 4) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0)) {
rv = 5;
} else if (isDelete()) {
rv = 5;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 should be cPhs_COMPLEATE_e, 5 should be cPhs_ERROR_e

mFlowNodeNo = getFlowNodeNo();
mTwilight = false;

rv = loadRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this cast necessary?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried fiddling around with it, and even got the function to hit 100%, but I couldn't do it without that cast. Maybe there's a way to not need it, but I couldn't seem to figure out how.

/* 80B6E6E8-80B6E6F0 002628 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
static bool daNpc_Zant_IsDelete(void* i_this) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should return int

@carter-ktb21 carter-ktb21 changed the title d_a_npc_zant almost matching d_a_npc_zant work Mar 31, 2025
@hatal175 hatal175 merged commit 59848ba into zeldaret:main Mar 31, 2025
1 check passed
@carter-ktb21 carter-ktb21 deleted the d_a_npc_zant branch April 1, 2025 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants