Skip to content

d_a_b_mgn (Dark Beast Ganon)#2348

Merged
TakaRikka merged 15 commits intozeldaret:mainfrom
carter-ktb21:d_a_b_mgn
Mar 27, 2025
Merged

d_a_b_mgn (Dark Beast Ganon)#2348
TakaRikka merged 15 commits intozeldaret:mainfrom
carter-ktb21:d_a_b_mgn

Conversation

@carter-ktb21
Copy link
Copy Markdown
Contributor

Significant work on d_a_b_mgn

Comment on lines +204 to +205
static int daB_MGN_Draw(daB_MGN_c* i_this) {
i_this->draw();
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.

remember to actually return the function return value in these methods

if (fopAcM_searchActorDistance((fopAc_ac_c*)param_1, (fopAc_ac_c*)param_2) < 1500.0f) {
f32 fVar1 = fopAcM_GetSpeedF((fopAc_ac_c*)param_1);
if (fVar1 != 0.0f) {
s16 sVar1 = *(s16*)((int)param_1 + 0x4de);
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.

you can just cast param_1 to fopAc_ac_c here and get what looks like current.angle.y

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 implementing this but it didn't seem to work. Maybe I just don't quite understand what you mean?

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.

something like

s16 svar1 = ((fopAc_ac_c*)param_1)->current.angle.y;

*/
int iVar2 = -1;
int unaff_r29;
if (mpModelMorf->mFrameCtrl.checkPass(40.0f)) {
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.

these checkPass calls should be mpModelMorf->checkFrame, make sure you're looking at the debug rom's version to get all the correct inlines

dBgS_GndChk dStack_6c;
cXyz local_78;

PSMTXCopy(mpModelMorf->getModel()->getAnmMtx(0x34), mDoMtx_stack_c::now);
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.

mDoMtx_stack_c::copy

fopAcM_effSmokeSet1(&field_0x25f8[0], &field_0x2608[0], &local_78, NULL, 15.0f, &tevStr, 1);
}

PSMTXCopy(mpModelMorf->getModel()->getAnmMtx(0x25), mDoMtx_stack_c::now);
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.

here too

Comment on lines 3340 to 3342
static void daB_MGN_Delete(daB_MGN_c* i_this) {
i_this->_delete();
}
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.

same here

int daB_MGN_c::CreateHeap() {
// NONMATCHING
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", 0x2f);
JUT_ASSERT(modelData != 0);
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.

make sure to include the line numbers for JUT_ASSERTS so it doesnt break the debug rom building

Comment on lines +3426 to +3428
static int useHeapInit(fopAc_ac_c* a_this) {
daB_MGN_c* i_this = (daB_MGN_c*)a_this;
i_this->CreateHeap();
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.

same here


attention_info.flags = 0;
attention_info.distances[2] = 0x16;
attention_info.distances[4] = '(';
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 be numerical value, not character

Comment on lines +3505 to 3507
static int daB_MGN_Create(daB_MGN_c* i_this) {
i_this->create();
}
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.

same here

@TakaRikka TakaRikka merged commit fcf83b8 into zeldaret:main Mar 27, 2025
1 check passed
@carter-ktb21 carter-ktb21 deleted the d_a_b_mgn 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.

2 participants