falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: falso:151d3deec1e22f981de3c457d124a6b352264571
Branches Tags
falso:main
falso:dol2asm
...
compare: falso:e48038e06c0e7c62832c8627d56d46d7f17e06d2
Branches Tags
falso:main
falso:dol2asm

14 Commits
151d3deec1 ... e48038e06c

Author SHA1 Message Date
Carco_21 e48038e06c
Merge e67fbe4376 into e0bbad1f3f 2025-08-01 11:33:01 +00:00
Carco_21 e67fbe4376
Merge pull request #3 from YunataSavior/npc_shad_fixes 
npc_shad fixes
 2025-08-01 07:32:57 -04:00
YunataSavior 807347ae1e npc_shad fixes 2025-07-30 21:17:51 -07:00
hatal175 26d1ce88ee
delete ; 2025-07-30 20:33:05 +03:00
carter-ktb21 030ff70f70 fixed nonmatching comments i forgot to take out 2025-07-29 07:09:27 -04:00
carter-ktb21 55fb1b389c Fixed some symbol generation (thanks Yunata!) 2025-07-29 07:08:32 -04:00
carter-ktb21 1be6a2cf27 param_c symbol now showing 2025-07-28 22:04:37 -04:00
carter-ktb21 3fcd6be1d4 enum work 2025-07-28 21:48:46 -04:00
Carter 2b3a12aa94 Fixed nonmatching comments 2025-07-28 15:18:45 -04:00
Carter 440f9df0bf All functions worked on 2025-07-28 15:14:53 -04:00
carter-ktb21 3057ed5b63 Work on EvCut functions 2025-07-25 21:34:18 -04:00
Carter 8df5cf3293 Action functions worked on 2025-07-25 14:57:28 -04:00
carter-ktb21 e6a2729505 some Create() work 2025-07-24 13:11:52 -04:00
carter-ktb21 4d405ea481 class structure work 2025-07-24 12:12:52 -04:00
5 changed files with 2852 additions and 2521 deletions
Show Stats Expand all files Collapse all files

2
configure.py
View File

@ -1836,7 +1836,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_seira"),
ActorRel(NonMatching, "d_a_npc_seira2"),
ActorRel(NonMatching, "d_a_npc_seirei"),
ActorRel(NonMatching, "d_a_npc_shad"),
ActorRel(NonMatching, "d_a_npc_shad", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_shaman"),
ActorRel(NonMatching, "d_a_npc_shoe", extra_cflags=[DANPCF_C_HACK]),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_shop0"),

1
include/d/actor/d_a_cstaF.h
View File

@ -33,6 +33,7 @@ public:
cXyz& getBallPos() { return m_ballPos; }
void onPlayerRide() { m_isPlayerRide = true; }
void onCoverVanishFlg() { m_coverVanishFlg = 1; }
struct BckTbl {
u16 idx[4];

269
include/d/actor/d_a_npc_shad.h
View File

@ -11,68 +11,243 @@
* @details
*
*/
class daNpcShad_c : public fopAc_ac_c {
struct daNpcShad_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
/* 0x6C */ f32 traveling_speed; // 走行速度 (Traveling Speed)
};
class daNpcShad_Param_c: public JORReflexible {
public:
/* 80AE1F70 */ virtual ~daNpcShad_Param_c() {}
#ifdef DEBUG
void genMessage(JORMContext*);
#endif
static const daNpcShad_HIOParam m;
};
class daNpcShad_c : public daNpcF_c {
public:
typedef bool (daNpcShad_c::*ActionFn)(void*);
typedef BOOL (daNpcShad_c::*EventFn)(int);
enum Animation {
/* 0x00 */ ANM_NONE,
/* 0x01 */ ANM_F_TALK_A,
/* 0x02 */ ANM_F_HAPPY,
/* 0x03 */ ANM_F_ANGER,
/* 0x04 */ ANM_F_DISCOURAGED,
/* 0x05 */ ANM_F_CHANT,
/* 0x06 */ ANM_F_KOMON,
/* 0x07 */ ANM_F_SURPRISE,
/* 0x08 */ ANM_FH_SURPRISE,
/* 0x09 */ ANM_FH_KOMON,
/* 0x0A */ ANM_FH_HAPPY,
/* 0x0B */ ANM_FH_ANGER,
/* 0x0C */ ANM_FH_DISCOURAGED,
/* 0x0D */ ANM_WAIT_A,
/* 0x0E */ ANM_TALK_A,
/* 0x0F */ ANM_STEP,
/* 0x10 */ ANM_STEPB,
/* 0x11 */ ANM_BOOK_WAIT,
/* 0x12 */ ANM_BOOK_TALK_A,
/* 0x13 */ ANM_HI,
/* 0x14 */ ANM_RUN_A,
/* 0x15 */ ANM_WALK_A,
/* 0x16 */ ANM_SIT_A,
/* 0x17 */ ANM_LOOKBACK,
/* 0x18 */ ANM_CHANT,
/* 0x19 */ ANM_DISCOURAGED,
/* 0x1A */ ANM_DISCOURAGED_WAIT,
/* 0x1B */ ANM_SITTALK_A,
/* 0x1C */ ANM_LOOK,
/* 0x1D */ ANM_LOOK_WAIT,
/* 0x1E */ ANM_SAD_WALK,
/* 0x1F */ ANM_LOOKUP,
/* 0x20 */ ANM_TAKE_KOMON,
/* 0x21 */ ANM_READ_KOMON,
/* 0x22 */ ANM_SURPRISE,
/* 0x23 */ ANM_SURPRISE_WAIT,
};
enum Expression {
/* 0x0 */ EXPR_TALK_A,
/* 0x1 */ EXPR_HAPPY,
/* 0x2 */ EXPR_ANGER,
/* 0x3 */ EXPR_DISCOURAGED,
/* 0x4 */ EXPR_KOMON,
/* 0x5 */ EXPR_SURPRISE,
/* 0x6 */ EXPR_H_SURPRISE,
/* 0x7 */ EXPR_H_KOMON,
/* 0x8 */ EXPR_H_HAPPY,
/* 0x9 */ EXPR_H_ANGER,
/* 0xA */ EXPR_H_DISCOURAGED,
/* 0xB */ EXPR_CHANT,
/* 0xC */ EXPR_NONE,
};
enum Expression_BTP {
/* 0x0 */ EXPR_BTP_SHAD,
/* 0x1 */ EXPR_BTP_F_ANGER,
/* 0x2 */ EXPR_BTP_F_DISCOURAGED,
/* 0x3 */ EXPR_BTP_F_HAPPY,
/* 0x4 */ EXPR_BTP_F_KOMON,
/* 0x5 */ EXPR_BTP_F_SURPRISE,
/* 0x6 */ EXPR_BTP_FH_SURPRISE,
/* 0x7 */ EXPR_BTP_FH_KOMON,
/* 0x8 */ EXPR_BTP_FH_ANGER,
/* 0x9 */ EXPR_BTP_FH_DISCOURAGED,
/* 0xA */ EXPR_BTP_FH_HAPPY
};
enum Motion {
/* 0x00 */ MOT_WAIT_A,
/* 0x01 */ MOT_BOOK_TALK_A,
/* 0x02 */ MOT_BOOK_WAIT,
/* 0x03 */ MOT_HI,
/* 0x04 */ MOT_SIT_A,
/* 0x05 */ MOT_LOOKBACK,
/* 0x06 */ MOT_DISCOURAGED,
/* 0x07 */ MOT_DISCOURAGED_WAIT,
/* 0x08 */ MOT_TALK_A,
/* 0x09 */ MOT_SITTALK_A,
/* 0x0A */ MOT_LOOK,
/* 0x0B */ MOT_TAKE_KOMON,
/* 0x0C */ MOT_READ_KOMON,
/* 0x0D */ MOT_LOOK_WAIT,
/* 0x0E */ MOT_SURPRISE,
/* 0x0F */ MOT_SURPRISE_WAIT,
/* 0x10 */ MOT_LOOKUP,
/* 0x11 */ MOT_SAD_WALK,
/* 0x12 */ MOT_CHANT,
/* 0x13 */ MOT_RUN_A,
/* 0x14 */ MOT_WALK_A,
/* 0x15 */ MOT_STEP,
/* 0x16 */ MOT_STEPB,
};
/* 80AD820C */ daNpcShad_c();
/* 80AD8420 */ ~daNpcShad_c();
/* 80AD8620 */ void Create();
/* 80AD8B60 */ void CreateHeap();
/* 80AD90E0 */ void Delete();
/* 80AD9114 */ void Execute();
/* 80AD9138 */ void Draw();
/* 80AD9280 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 80AD944C */ void createHeapCallBack(fopAc_ac_c*);
/* 80AD946C */ void ctrlJointCallBack(J3DJoint*, int);
/* 80AD94B8 */ void setExpressionAnm(int, bool);
/* 80AD974C */ void setExpressionBtp(int);
/* 80AD982C */ bool setMotionAnm(int, f32);
/* 80AD8620 */ cPhs__Step Create();
/* 80AD8B60 */ int CreateHeap();
/* 80AD90E0 */ int Delete();
/* 80AD9114 */ int Execute();
/* 80AD9138 */ int Draw();
/* 80AD9280 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 80AD944C */ static int createHeapCallBack(fopAc_ac_c*);
/* 80AD946C */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80AD94B8 */ bool setExpressionAnm(int, bool);
/* 80AD974C */ bool setExpressionBtp(int);
/* 80AD982C */ void setMotionAnm(int, f32);
/* 80AD99B4 */ void reset();
/* 80AD9C0C */ void setWaitAction();
/* 80AD9E04 */ void getPathPoint(u8, int, Vec*);
/* 80AD9E90 */ void isSneaking();
/* 80AD9F00 */ void wait_type0(void*);
/* 80ADA630 */ void setMotion(int, f32, int);
/* 80AD9C0C */ inline void setWaitAction();
/* 80AD9E04 */ inline bool getPathPoint(u8, int, Vec*);
/* 80AD9E90 */ inline bool isSneaking();
/* 80AD9F00 */ bool wait_type0(void*);
/* 80ADA630 */ void setMotion(int, f32, BOOL);
/* 80ADA674 */ void setExpression(int, f32);
/* 80ADA6A0 */ void wait_type1(void*);
/* 80ADB428 */ void wait_type2(void*);
/* 80ADB628 */ void talk(void*);
/* 80ADBEA8 */ void demo(void*);
/* 80ADC3DC */ void leave(void*);
/* 80ADC700 */ void EvCut_Introduction(int);
/* 80ADC800 */ void EvCut_Meeting(int);
/* 80ADCAD8 */ void EvCut_ToChantSpell1(int);
/* 80ADD720 */ void EvCut_ToChantSpell2(int);
/* 80ADE47C */ void EvCut_ToChantSpell2Skip(int);
/* 80ADE5F8 */ void EvCut_DiscoveryCannon(int);
/* 80ADED68 */ void EvCut_DiscoveryCannonSkip(int);
/* 80ADEEE4 */ void EvCut_Disappear(int);
/* 80ADF810 */ void EvCut_DisappearSkip(int);
/* 80ADF8DC */ void EvCut_CallBack(int);
/* 80ADFB70 */ void EvCut_WiretapSponsor(int);
/* 80ADFE74 */ void EvCut_WiretapEntrant(int);
/* 80ADA6A0 */ bool wait_type1(void*);
/* 80ADB428 */ bool wait_type2(void*);
/* 80ADB628 */ bool talk(void*);
/* 80ADBEA8 */ bool demo(void*);
/* 80ADC3DC */ bool leave(void*);
/* 80ADC700 */ BOOL EvCut_Introduction(int);
/* 80ADC800 */ BOOL EvCut_Meeting(int);
/* 80ADCAD8 */ BOOL EvCut_ToChantSpell1(int);
/* 80ADD720 */ BOOL EvCut_ToChantSpell2(int);
/* 80ADE47C */ BOOL EvCut_ToChantSpell2Skip(int);
/* 80ADE5F8 */ BOOL EvCut_DiscoveryCannon(int);
/* 80ADED68 */ BOOL EvCut_DiscoveryCannonSkip(int);
/* 80ADEEE4 */ BOOL EvCut_Disappear(int);
/* 80ADF810 */ BOOL EvCut_DisappearSkip(int);
/* 80ADF8DC */ BOOL EvCut_CallBack(int);
/* 80ADFB70 */ BOOL EvCut_WiretapSponsor(int);
/* 80ADFE74 */ BOOL EvCut_WiretapEntrant(int);
/* 80AE01BC */ void setParam();
/* 80AE0438 */ void main();
/* 80AE0438 */ BOOL main();
/* 80AE04D8 */ void playMotion();
/* 80AE0B58 */ void playExpression();
/* 80AE0ED0 */ void ctrlBtk();
/* 80AE0ED0 */ BOOL ctrlBtk();
/* 80AE0FAC */ void setAttnPos();
/* 80AE1320 */ void lookat();
/* 80AE153C */ bool drawDbgInfo();
/* 80AE153C */ BOOL drawDbgInfo();
static u8 mEvtSeqList[168];
static EventFn mEvtSeqList[14];
u8 getPathID() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
s16 getMessageNo() { return shape_angle.x; }
inline void setAction(ActionFn action) {
field_0xe1a = 3;
if (mActionFn) {
(this->*mActionFn)(NULL);
}
field_0xe1a = 0;
mActionFn = action;
if (mActionFn) {
(this->*mActionFn)(NULL);
}
}
inline csXyz* unk_inline();
inline BOOL chkFindPlayer();
inline void setLookMode(int, fopAc_ac_c*, cXyz*);
inline BOOL step(s16, int, f32);
inline void setExpressionTalkAfter();
inline void setLookObliquenessUp();
inline void searchActors() {
if (mMode == 0) {
if (mActorMngr[1].getActorP() == NULL) {
mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_ASH));
}
if (mActorMngr[2].getActorP() == NULL) {
mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_RAFREL));
}
if (mActorMngr[3].getActorP() == NULL) {
mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR));
}
if (mActorMngr[4].getActorP() == NULL) {
mActorMngr[4].entry(getEvtAreaTagP(17, 0));
}
} else if (mMode == 1 && daNpcF_chkEvtBit(0x12E) && mActorMngr[4].getActorP() == NULL) {
mActorMngr[4].entry(getEvtAreaTagP(18, 0));
}
}
private:
/* 0x568 */ u8 field_0x568[0xe24 - 0x568];
/* 0xB48 */ J3DModel* mBookKnifeModel;
/* 0xB4C */ J3DModel* mKomonshoModel;
/* 0xB50 */ Z2Creature mSound;
/* 0xBE0 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBE4 */ daNpcF_Lookat_c mLookat;
/* 0xC80 */ daNpcF_ActorMngr_c mActorMngr[5];
/* 0xCA8 */ daPy_py_c* field_0xca8;
/* 0xCAC */ u8 field_0xcac[0xcb0 - 0xcac];
/* 0xCB0 */ dCcD_Cyl field_0xcb0;
/* 0xDEC */ ActionFn mActionFn;
/* 0xDF8 */ request_of_phase_process_class mPhases[2];
/* 0xE08 */ fpc_ProcID mItemPartnerId;
/* 0xE0C */ int field_0xe0c;
/* 0xE10 */ int field_0xe10;
/* 0xE14 */ s16 field_0xe14;
/* 0xE16 */ s16 field_0xe16;
/* 0xE18 */ s16 mLookMode;
/* 0xE1A */ u16 field_0xe1a;
/* 0xE1C */ s16 field_0xe1c;
/* 0xE1E */ u8 field_0xe1e;
/* 0xE1F */ u8 field_0xe1f;
/* 0xE20 */ u8 mMode;
};
STATIC_ASSERT(sizeof(daNpcShad_c) == 0xe24);
class daNpcShad_Param_c {
public:
/* 80AE1F70 */ ~daNpcShad_Param_c();
static u8 const m[112];
};
#endif /* D_A_NPC_SHAD_H */

5098
src/d/actor/d_a_npc_shad.cpp
View File

File diff suppressed because it is too large Load Diff

3
src/d/actor/d_a_npc_wrestler.cpp
View File

@ -1781,7 +1781,6 @@ inline bool daNpcWrestler_c::talk(void* param_1) {
/* 80B31EB0-80B32058 002D10 01A8+00 4/0 0/0 0/0 .text demo__15daNpcWrestler_cFPv */
inline bool daNpcWrestler_c::demo(void* param_1) {
// NONMATCHING - register weirdness in GCN
dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
switch (field_0xe96) {
@ -1790,7 +1789,7 @@ inline bool daNpcWrestler_c::demo(void* param_1) {
break;
case 2: {
int staffID = eventManager->getMyStaffId(l_myName, NULL, 0);
s32 staffID = eventManager->getMyStaffId(l_myName, NULL, 0);
mStaffID = staffID;
JUT_ASSERT(2886, 0 != mEvtSeqList[mOrderEvtNo]);