mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-10 12:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert merges

Browse Source
This commit is contained in:
WilliamArnett
2025-05-26 04:22:03 -05:00
parent eb64133a6c
commit b7dc2aca2c
4 changed files with 274 additions and 2841 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
-1
View File
@@ -1605,7 +1605,6 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_kg1"),
ActorRel(NonMatching, "d_a_npc_kg2"),
ActorRel(NonMatching, "d_a_npc_kk1"),
ActorRel(Equivalent, "d_a_npc_kk1",extra_cflags=['-pragma "nosyminline on"']), # weak func order
ActorRel(Equivalent, "d_a_npc_km1",extra_cflags=['-pragma "nosyminline on"']), # weak func order
ActorRel(NonMatching, "d_a_npc_ko1"),
ActorRel(NonMatching, "d_a_npc_kp1"),
include/d/actor/d_a_npc_kk1.h
+70 -234
View File
@@ -1,71 +1,28 @@
#ifndef D_A_NPC_KK1_H
#define D_A_NPC_KK1_H
#include "JSystem/JParticle/JPAEmitter.h"
#include "d/d_npc.h"
#include "f_op/f_op_actor.h"
#include "m_Do/m_Do_hostIO.h"
class J3DNode;
static void* searchActor_SWC00(void*, void*);
class daNpc_Kk1_c : public fopNpc_npc_c {
class daNpc_Kk1_c : public fopAc_ac_c {
public:
typedef int (daNpc_Kk1_c::*ActionFunc)(void*);
typedef void* (pFunc)(void*, void*);
struct anm_prm_c {
s8 field0;
s8 field1;
u16 field2;
f32 field4;
f32 field8;
u32 fieldC;
};
struct prm_tbl {
u32 field_0x00;
u32 field_0x04;
u32 field_0x08;
u32 field_0x0C;
u32 field_0x10;
f32 field_0x14;
u32 field_0x18;
u32 field_0x1C;
u32 field_0x20;
u32 field_0x24;
f32 field_0x28;
f32 field_0x2C;
u32 field_0x30;
f32 field_0x34;
f32 field_0x38;
f32 field_0x3C;
u32 field_0x40;
f32 field_0x44;
f32 field_0x48;
u32 field_0x4C;
f32 field_0x50;
};
int getSWbit();
void getSWbit() {}
void _nodeCB_Head(J3DNode*, J3DModel*);
void _nodeCB_BackBone(J3DNode*, J3DModel*);
bool init_KK1_0();
bool createInit();
void init_KK1_0();
void createInit();
void play_animation();
void setMtx(bool);
int bckResID(int);
int btpResID(int);
bool setBtp(signed char, bool);
bool init_texPttrnAnm(signed char, bool);
void bckResID(int);
void btpResID(int);
void setBtp(signed char, bool);
void init_texPttrnAnm(signed char, bool);
void play_btp_anm();
void play_eff_anm();
void setAnm_anm(anm_prm_c*);
@@ -77,233 +34,112 @@ public:
void ctrlAnmAtr();
void setAnm_ATR();
void anmAtr(unsigned short);
u16 next_msgStatus(unsigned long*);
u32 getMsg_KK1_0();
u32 getMsg();
void next_msgStatus(unsigned long*);
void getMsg_KK1_0();
void getMsg();
void eventOrder();
void checkOrder();
bool chk_talk();
bool chk_parts_notMov();
fopAc_ac_c* searchByID(fpc_ProcID, int*);
bool partner_search_sub(pFunc*);
void chk_talk();
void chk_parts_notMov();
void searchByID(fpc_ProcID, int*);
void partner_search_sub(void* (*)(void*, void*));
void partner_search();
void lookBack();
bool chkAttention();
void chkAttention();
void setAttention(bool);
bool decideType(int);
void decideType(int);
void cut_init_RUN_START(int);
bool cut_move_RUN_START();
void cut_move_RUN_START();
void cut_init_RUN(int);
bool cut_move_RUN();
void cut_move_RUN();
void cut_init_CATCH_START(int);
bool cut_move_CATCH_START();
void cut_move_CATCH_START();
void cut_init_CATCH_END(int);
bool cut_move_CATCH_END();
void cut_move_CATCH_END();
void cut_init_TRN(int);
bool cut_move_TRN();
void cut_move_TRN();
void cut_init_BYE_START(int);
bool cut_move_BYE_START();
void cut_move_BYE_START();
void cut_init_BYE(int);
bool cut_move_BYE();
void cut_move_BYE();
void cut_init_BYE_CONTINUE(int);
bool cut_move_BYE_CONTINUE();
void cut_move_BYE_CONTINUE();
void cut_init_BYE_END(int);
bool cut_move_BYE_END();
void cut_move_BYE_END();
void cut_init_PLYER_TRN(int);
bool cut_move_PLYER_TRN();
void cut_move_PLYER_TRN();
void cut_init_OTOBOKE(int);
bool cut_move_OTOBOKE();
void cut_move_OTOBOKE();
void cut_init_PLYER_MOV(int);
bool cut_move_PLYER_MOV();
void cut_move_PLYER_MOV();
void cut_init_RUNAWAY_START(int);
bool cut_move_RUNAWAY_START();
void cut_move_RUNAWAY_START();
void cut_init_RUNAWAY_END(int);
bool cut_move_RUNAWAY_END();
void cut_move_RUNAWAY_END();
void privateCut(int);
void endEvent();
int isEventEntry();
void isEventEntry();
void event_proc(int);
bool checkCommandTalk();
bool set_action(ActionFunc, void*);
void checkCommandTalk();
void set_action(int (daNpc_Kk1_c::*)(void*), void*);
void setStt(signed char);
void createTama(float);
bool chk_areaIN(float, cXyz);
bool startEvent_check();
bool chkHitPlayer();
void chk_areaIN(float, cXyz);
void startEvent_check();
void chkHitPlayer();
void set_pthPoint(unsigned char);
bool event_move(bool);
cXyz kyoroPos(int);
bool kyorokyoro();
bool chk_attn();
void event_move(bool);
void kyoroPos(int);
void kyorokyoro();
void chk_attn();
void setBikon(cXyz);
void delBikon();
void setAse();
void flwAse();
void delAse();
BOOL wait_1();
BOOL walk_1();
BOOL wait_2();
void wait_1();
void walk_1();
void wait_2();
void init_CMT_WAI();
void move_CMT_WAI();
void init_CMT_TRN();
void move_CMT_TRN();
void init_CMT_PCK();
void move_CMT_PCK();
BOOL cmmt_1();
BOOL wait_3();
BOOL wait_4();
BOOL talk_1();
int wait_action1(void*);
u8 demo();
void cmmt_1();
void wait_3();
void wait_4();
void talk_1();
void wait_action1(void*);
void demo();
void shadowDraw();
BOOL _draw();
bool _draw();
bool _execute();
bool _delete();
cPhs_State _create();
BOOL bodyCreateHeap();
BOOL effcCreateHeap();
BOOL CreateHeap();
void bodyCreateHeap();
void effcCreateHeap();
void CreateHeap();
public:
/* 0x6C4 */ u8 m6C4[0x72C - 0x6C4];
/* 0x72C */ cXyz m72C;
/* 0x738 */ cXyz m738;
/* 0x744 */ u8 m744[0x750 - 0x744];
/* 0x750 */ cXyz m750;
/* 0x75C */ u8 m75C[0x7C4 - 0x75C];
/* 0x7C4 */ u8 m7C4;
/* 0x7C5 */ u8 m7C5[0x81E - 0x7C5];
/* 0x81E */ u8 m81E;
/* 0x81F */ u8 m81F[0x824 - 0x81F];
};
/* 0x6C4 */ request_of_phase_process_class field_0x6C4;
/* 0x6CC */ s8 m_hed_jnt_num;
/* 0x6CD */ s8 m_bbone_jnt_num;
/* 0x6CE */ char mArcName;
/* 0x6CF */ u8 field_0x6CF;
/* 0x6D0 */ u32 field_0x6D0;
/* 0x6D4 */ u32 mShadowID;
/* 0x6D8 */ mDoExt_btpAnm mBtpAnm;
/* 0x6EC*/ u8 mBtpFrame;
/* 0x6ED*/ s8 field_0x6ED;
/* 0x6EE*/ s16 field_0x6EE;
/* 0x6F0*/ ActionFunc field_0x6F0;
/* 0x6FC*/ fpc_ProcID mPartnerProcID;
/* 0x700*/ u32 field_0x700;
/* 0x704*/ dNpc_PathRun_c mRunPath;
/* 0x70C*/ cXyz field_0x70C;
/* 0x718*/ csXyz field_0x718;
/* 0x71E */ csXyz mAngle;
/* 0x724 */ u8 field_0x724[0x72C - 0x724];
/* 0x72C */ cXyz field_0x72C;
/* 0x738 */ cXyz field_0x738;
/* 0x744 */ u8 field_0x744[0x750 - 0x744];
/* 0x750 */ cXyz field_0x750;
/* 0x75C */ cXyz field_0x75C;
/* 0x768 */ f32 mAnimeFrame;
/* 0x76A */ u8 field_0x76A[4];
/* 0x770 */ s16 mLookBackAngleY;
/* 0x772 */ s16 mLookBackHeadY;
/* 0x774 */ s16 mLookBackBackboneY;
/* 0x776 */ s16 field_0x776;
/* 0x778 */ s32 field_0x778;
/* 0x77C */ s16 mEvtIDTbl[8];
/* 0x78C */ s16 mEvtIDIdx;
/* 0x78E */ s8 field_0x78E[0x792 - 0x78E];
/* 0x792 */ s16 field_0x792;
/* 0x794 */ s16 field_0x794;
/* 0x796 */ s16 mKyoroRNG;
/* 0x798 */ s16 mTimer;
/* 0x79A */ s16 field_0x79A;
/* 0x79C */ s16 field_0x79C;
/* 0x79E */ s16 field_0x79E;
/* 0x7A0 */ s16 field_0x7A0;
/* 0x7A2 */ s16 field_0x7A2;
/* 0x7A4 */ s16 field_0x7A4;
/* 0x7A6 */ s16 field_0x7A6;
/* 0x7A8 */ s16 field_0x7A8;
/* 0x7AA */ s16 field_0x7AA;
/* 0x7AC */ s16 field_0x7AC;
/* 0x7AE */ s16 mMuuruBadResponse;
/* 0x7B0 */ s16 mPrm0;
/* 0x7B2 */ s8 field_0x7B2;
/* 0x7B3 */ u8 field_0x7B3;
/* 0x7B4 */ u8 field_0x7B4;
/* 0x7B5 */ u8 mSWbit;
/* 0x7B6 */ u8 field_0x7B6;
/* 0x7B7 */ u8 field_0x7B7;
/* 0x7B8 */ u8 field_0x7B8;
/* 0x7B9 */ u8 field_0x7B9;
/* 0x7BA */ u8 field_0x7BA;
/* 0x7BB */ u8 field_0x7BB;
/* 0x7BC */ s8 field_0x7BC;
/* 0x7BD */ u8 field_0x7BD;
/* 0x7BE */ u8 field_0x7BE;
/* 0x7BF */ u8 field_0x7BF;
/* 0x7C0 */ u8 field_0x7C0;
/* 0x7C1 */ u8 field_0x7C1;
/* 0x7C2 */ u8 field_0x7C2;
/* 0x7C3 */ u8 field_0x7C3;
/* 0x7C4 */ bool mLockBodyRotation;
/* 0x7C5 */ bool field_0x7C5;
/* 0x7C6 */ u8 field_0x7C6;
/* 0x7C7 */ u8 field_0x7C7;
/* 0x7C8 */ mDoExt_bpkAnm field_0x7C8;
/* 0x7DC */ mDoExt_btkAnm field_0x7DC;
/* 0x7F0 */ mDoExt_bckAnm field_0x7F0;
/* 0x800 */ s16 field_0x800;
/* 0x802 */ s16 field_0x802;
/* 0x804 */ s16 field_0x804;
/* 0x806 */ u16 field_0x806;
/* 0x808*/ J3DModel* field_0x808;
/* 0x80C*/ u8 field_0x80C[0x810-0x80C];
/* 0x810 */ JPABaseEmitter* field_0x810;
/* 0x814 */ s8 mCutsceneIndex;
/* 0x815 */ s8 field_0x815;
/* 0x816 */ s8 field_0x816;
/* 0x817 */ u8 mAnimationNum;
/* 0x818 */ u8 field_0x818;
/* 0x819 */ s8 field_0x819;
/* 0x81A */ s8 field_0x81A;
/* 0x81B */ s8 field_0x81B;
/* 0x81C */ s8 field_0x81C;
/* 0x81D */ s8 field_0x81D;
/* 0x81E */ u8 mWhereToLook;
/* 0x81F */ s8 field_0x81F;
/* 0x820 */ s8 field_0x820;
/* 0x821 */ s8 field_0x821;
/* 0x822 */ s8 field_0x822;
/* 0x823 */ s8 field_0x823;
}; // Size: 0x824
class daNpc_Kk1_HIO_c : mDoHIO_entry_c{
class daNpc_Kk1_HIO_c {
public:
daNpc_Kk1_HIO_c();
virtual ~daNpc_Kk1_HIO_c(){};
public:
/* 0x04 */ s8 mNo;
/* 0x08 */ s16 mHorizontalDistance;
/* 0x08 */ s32 field_0xA;
/* 0x0C */ s16 field_0xC;
/* 0x0E */ s16 field_0xE;
/* 0x10 */ s16 field_0x10;
/* 0x12 */ s16 field_0x12;
/* 0x14 */ s16 field_0x14;
/* 0x16 */ s16 field_0x16;
/* 0x18 */ s16 field_0x18;
/* 0x1A */ s16 field_0x1A;
/* 0x1C */ s16 field_0x1C;
/* 0x1E */ s16 field_0x1E;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ u8 field_0x24;
/* 0x25 */ u8 field_0x25;
/* 0x26 */ s16 field_0x26;
/* 0x28 */ s16 field_0x28;
/* 0x28 */ s16 field_0x2A;
/* 0x2C */ s16 field_0x2C;
/* 0x2C */ s16 field_0x2E;
/* 0x30 */ s16 mScale;
/* 0x32 */ s16 mMaxStep;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3C;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ f32 field_0x44;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4C;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5C;
/* Place member variables here */
};
#endif /* D_A_NPC_KK1_H */
include/d/d_cc_uty.h
+1 -3
View File
@@ -29,8 +29,6 @@ void def_se_set_p(fopAc_ac_c*, cXyz*, cCcD_Obj*, unsigned long);
fopAc_ac_c* at_power_check(CcAtInfo*);
fopAc_ac_c* cc_at_check(fopAc_ac_c*, CcAtInfo*);
inline fopAc_ac_c* dCc_GetAc(void* i_obj) {
return ((cCcD_Obj*)i_obj)->GetAc();
}
inline void dCc_GetAc(void*) {}
#endif /* D_CC_UTY_H */
src/d/actor/d_a_npc_kk1.cpp
+203 -2603
View File
File diff suppressed because it is too large Load Diff