d_a_npc_jagar - ~94% by carter-ktb21 · Pull Request #2309 · zeldaret/tp

carter-ktb21 · 2025-02-24T00:50:15Z

Jagar class almost equivalent.

Initial jaggle work

TakaRikka

overall looks good, just some cleanup that could be done and double check that nonmatching functions are labeled appropriately as such. you do seem to have a build error however that will need to be fixed

TakaRikka · 2025-03-04T01:25:43Z

src/d/actor/d_a_npc_jagar.cpp

@@ -276,33 +280,17 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" extern void* __vt__14J3DMaterialAnm[4];
 extern "C" u8 now__14mDoMtx_stack_c[48];
-extern "C" extern u8 g_meter2_info[248];
+extern "C" extern dMeter2Info_c g_meter2_info;


this can be removed since you're already including d_meter2_info.h

TakaRikka · 2025-03-04T01:28:09Z

src/d/actor/d_a_npc_jagar.cpp

+    mTwilight = 0; /* WIP */
+    int rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
+    if (rv == cPhs_COMPLEATE_e) {
+    //     OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this), (uint)mType,
+    //                           field_0xa7c, getPathID(), fopAcM_GetParam(this));
+        if (isDelete()) {
+            return cPhs_ERROR_e;
+        }
+    //     OS_REPORT("\n");


are these comments important? if the function is matching i'd assume its fine to uncomment and remove the temp one?

TakaRikka · 2025-03-04T01:29:19Z

src/d/actor/d_a_npc_jagar.cpp

-    0x00,
-    0x00,
-    0x00,
+static int const heapSize[4] = {


just a note, any data that ends with something like $1234 is an in-function static. so this probably belongs in the create func

TakaRikka · 2025-03-04T01:30:47Z

src/d/actor/d_a_npc_jagar.cpp

+            bool rv = true;
+            if (!daNpcT_chkEvtBit(0xd3) && !dComIfGs_isCollectShield(0)) {
+                rv = false;
+            }
+            return rv;


does this work as a single line return?

return daNpcT_chkEvtBit(0xd3) || dComIfGs_isCollectShield(0);

It does not :/

TakaRikka · 2025-03-04T01:34:56Z

src/d/actor/d_a_npc_jagar.cpp

+    csXyz acStack_20;
+    int iVar1 = (u8*)&field_0x1008 - (u8*)&field_0xfd4;
+    if (mpMatAnm != NULL) {
+        mpMatAnm->initialize();
+    }
+    initialize();
+    for (int i = 0; i < 5; i++) {
+        mActorMngr[i].initialize();
+    }
+    memset(&field_0xfd4, 0, iVar1);
+    acStack_20.setall(0);
+    acStack_20.y = home.angle.y;
+    switch (mType) {
+        case TYPE_0:
+            if (daNpcT_chkEvtBit(0x1c) != 0) {
+                if (daNpcT_chkEvtBit(0x86) == 0) {
+                    daNpcT_onEvtBit(0x86);
+                }
+                field_0x1001 = 1;
+            }
+        case TYPE_1:
+        case TYPE_2:
+        default:
+            daNpcT_offTmpBit(0x1b);
+            daNpcT_offTmpBit(0x10);
+            setAngle(acStack_20);
+    }


just a general style note that putting new lines after things like if statements, for loops, etc helps functions look more readable. dont worry too much about it, i wouldnt reject over it, but just something to keep in mind

TakaRikka · 2025-03-04T01:37:15Z

src/d/actor/d_a_npc_jagar.cpp

-COMPILER_STRIP_GATE(0x80A1A40C, &lit_4932);
-#pragma pop
+// /* 80A1ADE0-80A1ADE4 000008 0001+03 1/1 0/0 0/0 .bss             @1109 */
+// static u8 lit_1109[1 + 3 /* padding */];


you can try replacing these unused bss literals with the UNK_REL_BSS macro to make it look cleaner until we find a better solution

I put that macro towards the top. Is the placement important?

TakaRikka · 2025-03-04T01:41:49Z

src/d/actor/d_a_npc_jagar.cpp

-void daNpc_Jagar_c::chkToMotion() {
-    // NONMATCHING
+int daNpc_Jagar_c::chkToMotion() {
+    // The inline assembly was the only way I could find to get proper regalloc


if this is still nonmatching the nonmatching tag should be kept. otherwise, all the asm comments should probably be removed. its pretty much certain that these were not written with inline asm so it shouldnt be used here

Put nonmatching tags where they should still be

TakaRikka · 2025-03-04T01:43:24Z

src/d/actor/d_a_npc_jagar.cpp

+    }
+    if (mHide != 0) {
+        fopAcM_setCullSizeBox((fopAc_ac_c *)this, -300.0f, -50.0f, -200.0f, 300.0f, 300.0f, 400.0f);
+        goto LAB_80a18a8c;


should probably put some kind of note about this being a fakematch, as its very unlikely they originally used gotos here

TakaRikka · 2025-03-04T01:44:43Z

src/d/actor/d_a_npc_jagar.cpp

-#pragma pop
+// /* ############################################################################################## */
+// /* 80A1AE4C-80A1AE50 000074 0004+00 0/0 0/0 0/0 .bss
+//  * sInstance__40JASGlobalInstance<19JASDefaultBankTable>        */


these comments should be able to removed now?

missed build not passing

hatal175 · 2025-03-06T22:03:39Z

Needs to fix
886: SECTION_RODATA u8 const daNpc_Bou_Param_c::m[156] = {

Error: ^

identifier 'daNpc_Bou_Param_c::m' redeclared

carter-ktb21 added 30 commits February 11, 2025 22:31

Began work on d_a_npc_jagar

2d8c2b5

Major work on daNpc_Jagar_c::create()

d9b7f65

Jagar create() - 11%

bcd3df6

Continued work on daNpc_Jagar_c

52b7b77

Jagar create() - 87%

3f7e0fe

Continues work on Jagar

db2e20f

Work on Jagar.checkChangeEvt()

bdb2f5b

Working on Jagar.talk()

6c9db98

Work on Jagar.changeBtp()

6584d5c

Jagar.checkChangeJoint() & checkRemoveJoint()

6df3c09

Jagar.chkAction() & setAction()

1167076

Jagar.chkChuMotion()

1ac5c84

Jagar.chkSitMotion() & chkSitMotion2()

4f7a385

Jagar.chkToMotion()

ce61e79

Jagar.CreateHeap()

15adb57

Jagar.createHeapCallBack() & ctrlJointCallBack()

554de51

Jagar.cuAnger()

a2e9b16

Jagar.cutClimbUp() - 92%

fb8fa94

Jagar.setAttnPos() - 85%

876bf11

Jagar.cutConversationWithBou() - 48%

356a74a

Jagar work and daNpcT_c::getActorDistance - 83%

8563354

Jagar setParam work and daNpcT_c::getActorDistance - 85%

f3c23d6

Prep Jagar push to main

6d0103c

Merge branch 'initial_jaggle_work'

249fc72

Merge pull request #1 from carter-ktb21/initial_jaggle_work

69cd70c

Initial jaggle work

Merge branch 'main' of https://github.com/carter-ktb21/tp

c36ba45

little cleanup

0b556e5

Fixed return type discrepancy

b71d421

Merge branch 'initial_jaggle_work'

cc3f401

Fixed *other* return type issues & variable names for Jagar

5d670d7

carter-ktb21 marked this pull request as draft February 24, 2025 02:45

carter-ktb21 added 12 commits February 24, 2025 17:00

Jagar talkWithBou work

443bfd3

Work on Jagar talk

4c4f2cf

Data & function cleanup

ebc0662

I dont remember what i added this time lol

ff3ed46

Finished some functions

a7d0caa

Reworking Jagar talk()

cf7a68a

Finished some functions

3739114

Attempting to rework cutNeedYourHelp

44f37d9

Merge branch 'zeldaret:main' into main

9e59016

Almost(ish) done with Jaggle

cd1a498

Almost done with Jaggle

ad4e31a

Took out inline assembly in Jagar.chkToMotion()

2eb6805

carter-ktb21 changed the title ~~d_a_npc_jagar - ~78%~~ d_a_npc_jagar - ~94% Mar 2, 2025

carter-ktb21 added 2 commits March 2, 2025 18:51

Cleanup

51ba596

Minor variable initialization change

b5426ed

carter-ktb21 marked this pull request as ready for review March 3, 2025 01:58

TakaRikka reviewed Mar 4, 2025

View reviewed changes

carter-ktb21 added 2 commits March 4, 2025 13:16

Merge branch 'zeldaret:main' into main

b772c03

Small cleanup

b7915f0

hatal175 previously approved these changes Mar 6, 2025

View reviewed changes

Hopefully fixed d_a_npc_bou compilation error

f28c011

hatal175 approved these changes Mar 7, 2025

View reviewed changes

hatal175 merged commit 0f141c2 into zeldaret:main Mar 7, 2025
1 check passed

Conversation

carter-ktb21 commented Feb 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TakaRikka left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hatal175 commented Mar 6, 2025

Error: ^

identifier 'daNpc_Bou_Param_c::m' redeclared

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

carter-ktb21 commented Feb 24, 2025 •

edited

Loading