mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-08 18:43:05 -04:00
Start Orca
This commit is contained in:
SuperDude88
+1
-1
@@ -1469,7 +1469,7 @@ config.libs = [
|
||||
ActorRel(NonMatching, "d_a_npc_ho"),
|
||||
ActorRel(NonMatching, "d_a_npc_hr"),
|
||||
ActorRel(NonMatching, "d_a_npc_jb1"),
|
||||
ActorRel(NonMatching, "d_a_npc_ji1"),
|
||||
ActorRel(NonMatching, "d_a_npc_ji1", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(NonMatching, "d_a_npc_kamome", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(NonMatching, "d_a_npc_kf1"),
|
||||
ActorRel(NonMatching, "d_a_npc_kg1"),
|
||||
|
||||
@@ -202,6 +202,9 @@ public:
|
||||
void setEmitterTranslation(const JGeometry::TVec3<f32>& trans) {
|
||||
mEmitterTranslation.set(trans);
|
||||
}
|
||||
void setEmitterTranslation(f32 x, f32 y, f32 z) {
|
||||
mEmitterTranslation.set(x, y, z);
|
||||
}
|
||||
void setEmitterScale(const JGeometry::TVec3<f32>& scale) {
|
||||
mEmitterScale.set(scale);
|
||||
}
|
||||
@@ -224,6 +227,7 @@ public:
|
||||
void setVolumeSize(u16 size) { mVolumeSize = size; }
|
||||
void setLifeTime(s16 i_lifeTime) { mLifeTime = i_lifeTime; }
|
||||
void setRate(f32 i_rate) { mRate = i_rate; }
|
||||
void setRandomDirectionSpeed(f32 i_speed) { mInitialVelRndm = i_speed; }
|
||||
void setDirectionalSpeed(f32 i_speed) { mInitialVelDir = i_speed; }
|
||||
void setAwayFromAxisSpeed(f32 i_speed) { mInitialVelAxis = i_speed; }
|
||||
void setAwayFromCenterSpeed(f32 i_speed) { mInitialVelOmni = i_speed; }
|
||||
@@ -290,7 +294,6 @@ public:
|
||||
void setGlobalParticleScale(f32, f32) {}
|
||||
void setGlobalParticleWidthScale(f32) {}
|
||||
void setGlobalSRTMatrix(MtxP) {}
|
||||
void setRandomDirectionSpeed(f32) {}
|
||||
|
||||
static JPAEmitterInfo emtrInfo;
|
||||
|
||||
|
||||
+287
-58
@@ -2,7 +2,15 @@
|
||||
#define D_A_NPC_JI1_H
|
||||
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "m_Do/m_Do_hostIO.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/d_lib.h"
|
||||
#include "d/d_npc.h"
|
||||
#include "d/d_particle.h"
|
||||
#include "SSystem/SComponent/c_angle.h"
|
||||
#include "JSystem/J3DGraphAnimator/J3DNode.h"
|
||||
|
||||
class mDoExt_McaMorf;
|
||||
|
||||
class daNpc_Ji1_c : public fopAc_ac_c {
|
||||
public:
|
||||
@@ -12,59 +20,59 @@ public:
|
||||
void setAction(int (daNpc_Ji1_c::*)(void*), void*) {}
|
||||
void setSubAction(int (daNpc_Ji1_c::*)()) {}
|
||||
|
||||
void isGuardAnim();
|
||||
void isAttackAnim();
|
||||
void isAttackFrame();
|
||||
void isItemWaitAnim();
|
||||
void isClearRecord(short);
|
||||
BOOL isGuardAnim();
|
||||
BOOL isAttackAnim();
|
||||
int isAttackFrame();
|
||||
BOOL isItemWaitAnim();
|
||||
BOOL isClearRecord(short);
|
||||
void setClearRecord(short);
|
||||
void normalSubActionHarpoonGuard(short);
|
||||
void normalSubActionGuard(short);
|
||||
void normalAction(void*);
|
||||
void kaitenExpAction(void*);
|
||||
void kaitenspeakAction(void*);
|
||||
void kaitenwaitAction(void*);
|
||||
void kaitenAction(void*);
|
||||
void getMsg1stType();
|
||||
void getMsg2ndType();
|
||||
void getMsg();
|
||||
void next_msgStatus(unsigned long*);
|
||||
void talkAction(void*);
|
||||
void speakAction(void*);
|
||||
void speakBadAction(void*);
|
||||
void initPosObject(void*, void*);
|
||||
u32 normalSubActionHarpoonGuard(short);
|
||||
u32 normalSubActionGuard(short);
|
||||
u32 normalAction(void*);
|
||||
u32 kaitenExpAction(void*);
|
||||
u32 kaitenspeakAction(void*);
|
||||
u32 kaitenwaitAction(void*);
|
||||
u32 kaitenAction(void*);
|
||||
u32 getMsg1stType();
|
||||
u32 getMsg2ndType();
|
||||
u32 getMsg();
|
||||
u16 next_msgStatus(u32* msgId);
|
||||
u32 talkAction(void*);
|
||||
u32 speakAction(void*);
|
||||
u32 speakBadAction(void*);
|
||||
static void* initPosObject(void*, void*);
|
||||
void initPos(int);
|
||||
void createItem();
|
||||
void set_mtx();
|
||||
void getEventActionNo(int);
|
||||
void eventAction(void*);
|
||||
void evn_init_pos_init(int);
|
||||
void evn_setAnm_init(int);
|
||||
void evn_talk_init(int);
|
||||
void evn_talk();
|
||||
void evn_continue_talk_init(int);
|
||||
void evn_continue_talk();
|
||||
void evn_setAngle_init(int);
|
||||
void evn_sound_proc_init(int);
|
||||
void evn_head_swing_init(int);
|
||||
void evn_harpoon_proc_init(int);
|
||||
void evn_RollAtControl_init(int);
|
||||
void evn_RollAtControl();
|
||||
void evn_game_mode_init(int);
|
||||
void evn_turn_to_player();
|
||||
void evn_hide_init(int);
|
||||
s32 getEventActionNo(int);
|
||||
u32 eventAction(void*);
|
||||
u32 evn_init_pos_init(int);
|
||||
u32 evn_setAnm_init(int);
|
||||
u32 evn_talk_init(int);
|
||||
u32 evn_talk();
|
||||
u32 evn_continue_talk_init(int);
|
||||
u32 evn_continue_talk();
|
||||
u32 evn_setAngle_init(int);
|
||||
u32 evn_sound_proc_init(int);
|
||||
u32 evn_head_swing_init(int);
|
||||
u32 evn_harpoon_proc_init(int);
|
||||
u32 evn_RollAtControl_init(int);
|
||||
u32 evn_RollAtControl();
|
||||
u32 evn_game_mode_init(int);
|
||||
u32 evn_turn_to_player();
|
||||
u32 evn_hide_init(int);
|
||||
void AnimeControlToWait();
|
||||
void privateCut();
|
||||
void setParticle(int, float, float);
|
||||
u32 privateCut();
|
||||
u32 setParticle(int, float, float);
|
||||
void dtParticle();
|
||||
void setParticleAT(int, float, float);
|
||||
u32 setParticleAT(int, float, float);
|
||||
void dtParticleAT();
|
||||
void startspeakAction(void*);
|
||||
void endspeakAction(void*);
|
||||
u32 endspeakAction(void*);
|
||||
void reiAction(void*);
|
||||
void plmoveAction(void*);
|
||||
void teachMove(float);
|
||||
void teachSpRollCutMove(float);
|
||||
BOOL teachSpRollCutMove(float);
|
||||
void calcCoCorrectValue();
|
||||
void calcBgCorrectValue();
|
||||
void MoveToPlayer(float, unsigned char);
|
||||
@@ -73,13 +81,13 @@ public:
|
||||
void teachSubActionJumpInit();
|
||||
void teachSubActionJump();
|
||||
void teachAction(void*);
|
||||
void teachSPRollCutAction(void*);
|
||||
u32 teachSPRollCutAction(void*);
|
||||
void battleGameSetTimer();
|
||||
void battleMove(float);
|
||||
void battleSubActionWaitInit();
|
||||
void battleSubActionWait();
|
||||
void battleSubActionNockBackInit(int);
|
||||
void battleSubActionNockBack();
|
||||
u32 battleSubActionNockBack();
|
||||
void battleSubActionAttackInit();
|
||||
void battleSubActionAttack();
|
||||
void battleSubActionTateAttackInit();
|
||||
@@ -95,19 +103,19 @@ public:
|
||||
void battleSubActionGuardInit();
|
||||
void battleSubActionGuard();
|
||||
void battleAtSet();
|
||||
void battleGuardCheck();
|
||||
void battleAction(void*);
|
||||
void checkCutType(int, int);
|
||||
BOOL battleGuardCheck();
|
||||
u32 battleAction(void*);
|
||||
BOOL checkCutType(int, int);
|
||||
void setAnimFromMsgNo(unsigned long);
|
||||
void setAnm(int, float, int);
|
||||
BOOL setAnm(int, float, int);
|
||||
s32 _create();
|
||||
void CreateHeap();
|
||||
void CreateInit();
|
||||
BOOL CreateHeap();
|
||||
BOOL CreateInit();
|
||||
BOOL _delete();
|
||||
BOOL _execute();
|
||||
BOOL _draw();
|
||||
void chkAttention(cXyz, short);
|
||||
void lookBack();
|
||||
BOOL chkAttention(cXyz, short);
|
||||
BOOL lookBack();
|
||||
void setHitParticle(cXyz*, unsigned long);
|
||||
void setGuardParticle();
|
||||
void BackSlideInit();
|
||||
@@ -116,15 +124,236 @@ public:
|
||||
void harpoonMove();
|
||||
|
||||
public:
|
||||
/* 0x290 */ u8 m290[0xD88 - 0x290];
|
||||
};
|
||||
typedef u32 (daNpc_Ji1_c::*Func_t)(void*);
|
||||
typedef u32 (daNpc_Ji1_c::*Func2_t)();
|
||||
|
||||
class daNpc_Ji1_HIO_c {
|
||||
/* 0x290 */ f32 field_0x290;
|
||||
/* 0x294 */ f32 field_0x294;
|
||||
/* 0x298 */ f32 field_0x298;
|
||||
/* 0x29C */ f32 field_0x29C;
|
||||
/* 0x2A0 */ f32 field_0x2A0;
|
||||
/* 0x2A4 */ f32 field_0x2A4;
|
||||
/* 0x2A8 */ u8 field_0x2A8;
|
||||
/* 0x2AC */ u32 field_0x2AC;
|
||||
/* 0x2B0 */ Func_t field_0x2B0;
|
||||
/* 0x2BC */ Func_t field_0x2BC;
|
||||
/* 0x2C8 */ Func_t field_0x2C8;
|
||||
/* 0x2D4 */ Func2_t field_0x2D4;
|
||||
/* 0x2E0 */ dPa_smokeEcallBack field_0x2E0;
|
||||
/* 0x300 */ dPa_smokeEcallBack field_0x300;
|
||||
/* 0x320 */ cXyz field_0x320;
|
||||
/* 0x32C */ s16 field_0x32C;
|
||||
/* 0x330 */ mDoExt_McaMorf* field_0x330;
|
||||
/* 0x334 */ dNpc_EventCut_c mEventCut;
|
||||
/* 0x3A0 */ dNpc_JntCtrl_c m_jnt;
|
||||
/* 0x3D4 */ J3DAnmTexPattern* headTexPattern;
|
||||
/* 0x3D8 */ mDoExt_btpAnm field_0x3D8;
|
||||
/* 0x3EC */ u8 field_0x3EC;
|
||||
/* 0x3EE */ s16 field_0x3EE;
|
||||
/* 0x3F0 */ u32 field_0x3F0;
|
||||
/* 0x3F4 */ mDoExt_McaMorf* mpMorf;
|
||||
/* 0x3F8 */ J3DModel* field_0x3F8;
|
||||
/* 0x3FC */ mDoExt_brkAnm field_0x3FC;
|
||||
/* 0x414 */ f32 field_0x414;
|
||||
/* 0x418 */ mDoExt_btkAnm field_0x418;
|
||||
/* 0x42C */ f32 field_0x42C;
|
||||
/* 0x430 */ JPABaseEmitter* field_0x430;
|
||||
/* 0x434 */ dBgS_ObjAcch field_0x434;
|
||||
/* 0x5F8 */ dBgS_AcchCir field_0x5F8;
|
||||
/* 0x638 */ dCcD_Stts field_0x638;
|
||||
/* 0x674 */ dCcD_Stts field_0x674;
|
||||
/* 0x6B0 */ dCcD_Cyl field_0x6B0;
|
||||
/* 0x7E0 */ dCcD_Cyl field_0x7E0;
|
||||
/* 0x910 */ dCcD_Cyl field_0x910;
|
||||
/* 0xA40 */ dCcD_Cps field_0xA40;
|
||||
/* 0xB78 */ cXyz field_0xB78;
|
||||
/* 0xB84 */ cXyz field_0xB84;
|
||||
/* 0xB90 */ cXyz field_0xB90;
|
||||
/* 0xB9C */ s8 handRJointNo;
|
||||
/* 0xB9D */ s8 hair1JointNo;
|
||||
/* 0xB9E */ s8 hair2JointNo;
|
||||
/* 0xB9F */ s8 hair3JointNo;
|
||||
/* 0xBA0 */ s8 armLJointNo;
|
||||
/* 0xBA1 */ s8 armRJointNo;
|
||||
/* 0xBA2 */ s16 field_0xBA2;
|
||||
/* 0xBA4 */ s16 field_0xBA4;
|
||||
/* 0xBA6 */ s16 field_0xBA6;
|
||||
/* 0xBA8 */ s16 field_0xBA8;
|
||||
/* 0xBAA */ s16 field_0xBAA;
|
||||
/* 0xBAC */ s16 field_0xBAC;
|
||||
/* 0xBAE */ s16 field_0xBAE;
|
||||
/* 0xBB0 */ s16 field_0xBB0;
|
||||
/* 0xBB2 */ s16 field_0xBB2;
|
||||
/* 0xBB4 */ s16 field_0xBB4;
|
||||
/* 0xBB6 */ s16 field_0xBB6;
|
||||
/* 0xBB8 */ s16 field_0xB86;
|
||||
/* 0xBBA */ s16 field_0xBBA;
|
||||
/* 0xBBC */ s16 field_0xBBC;
|
||||
/* 0xBBE */ s16 field_0xBBE;
|
||||
/* 0xBC0 */ s16 field_0xBC0;
|
||||
/* 0xBC2 */ s16 field_0xBC2;
|
||||
/* 0xBC4 */ s16 field_0xBC4;
|
||||
/* 0xBC6 */ s16 field_0xBC6;
|
||||
/* 0xBC8 */ s16 field_0xBC8;
|
||||
/* 0xBCA */ s16 field_0xBCA;
|
||||
/* 0xBCC */ s16 field_0xBCC;
|
||||
/* 0xBCE */ s16 field_0xBCE;
|
||||
/* 0xBD0 */ s16 field_0xBD0;
|
||||
/* 0xBD2 */ s16 field_0xBD2;
|
||||
/* 0xBD4 */ s16 field_0xBD4;
|
||||
/* 0xBD6 */ s16 field_0xBD6;
|
||||
/* 0xBD8 */ cXyz field_0xBD8[3];
|
||||
/* 0xBFC */ dNpc_HeadAnm_c field_0xBFC;
|
||||
/* 0xC20 */ u32 pad_0xC20;
|
||||
/* 0xC24 */ s32 field_0xC24;
|
||||
/* 0xC28 */ u32 field_0xC28;
|
||||
/* 0xC2C */ u32 field_0xC2C;
|
||||
/* 0xC30 */ s32 field_0xC30;
|
||||
/* 0xC34 */ s32 field_0xC34;
|
||||
/* 0xC38 */ s32 field_0xC38;
|
||||
/* 0xC3C */ s32 field_0xC3C;
|
||||
/* 0xC40 */ cXyz field_0xC40;
|
||||
/* 0xC4C */ f32 field_0xC4C;
|
||||
/* 0xC50 */ f32 field_0xC50;
|
||||
/* 0xC54 */ s16 field_0xC54;
|
||||
/* 0xC56 */ s16 field_0xC56;
|
||||
/* 0xC58 */ s16 field_0xC58;
|
||||
/* 0xC5A */ s16 field_0xC5A;
|
||||
/* 0xC5C */ s16 field_0xC5C;
|
||||
/* 0xC5E */ s16 field_0xC5E;
|
||||
/* 0xC60 */ s16 field_0xC60;
|
||||
/* 0xC62 */ s16 field_0xC62;
|
||||
/* 0xC64 */ s16 field_0xC64;
|
||||
/* 0xC66 */ s16 field_0xC66;
|
||||
/* 0xC68 */ s16 field_0xC68;
|
||||
/* 0xC6A */ s16 field_0xC6A;
|
||||
/* 0xC6C */ s16 field_0xC6C;
|
||||
/* 0xC6E */ s16 field_0xC6E;
|
||||
/* 0xC70 */ s16 field_0xC70;
|
||||
/* 0xC72 */ s16 field_0xC72;
|
||||
/* 0xC74 */ s16 field_0xC74;
|
||||
/* 0xC76 */ s16 field_0xC76;
|
||||
/* 0xC78 */ s8 field_0xC78;
|
||||
/* 0xC7C */ request_of_phase_process_class field_0xC7C;
|
||||
/* 0xC84 */ u32 field_0xC84;
|
||||
/* 0xC88 */ s16 field_0xC88;
|
||||
/* 0xC8C */ s32 field_0xC8C;
|
||||
/* 0xC90 */ s32 field_0xC90;
|
||||
/* 0xC94 */ u32 field_0xC94;
|
||||
/* 0xC98 */ u32 field_0xC98;
|
||||
/* 0xC9C */ f32 field_0xC9C;
|
||||
/* 0xCA0 */ Mtx field_0xCA0;
|
||||
/* 0xCD0 */ cXyz field_0xCD0;
|
||||
/* 0xCDC */ cXyz field_0xCDC;
|
||||
/* 0xCE8 */ u8 pad_0xCE8[0xC];
|
||||
/* 0xCF4 */ Quaternion field_0xCF4;
|
||||
/* 0xD04 */ f32 field_0xD04;
|
||||
/* 0xD08 */ f32 field_0xD08;
|
||||
/* 0xD0C */ f32 field_0xD0C;
|
||||
/* 0xD10 */ f32 field_0xD10;
|
||||
/* 0xD14 */ s16 field_0xD14;
|
||||
/* 0xD16 */ s16 field_0xD16;
|
||||
/* 0xD18 */ f32 field_0xD18;
|
||||
/* 0xD1C */ cXyz field_0xD1C;
|
||||
/* 0xD28 */ cXyz field_0xD28;
|
||||
/* 0xD34 */ u32 field_0xD34;
|
||||
/* 0xD38 */ cXyz field_0xD38;
|
||||
/* 0xD44 */ u8 pad_0xD44[0xC];
|
||||
/* 0xD50 */ cXyz field_0xD50;
|
||||
/* 0xD5C */ csXyz field_0xD5C;
|
||||
/* 0xD64 */ s32 field_0xD64;
|
||||
/* 0xD68 */ s32 field_0xD68;
|
||||
/* 0xD6C */ s32 field_0xD6C;
|
||||
/* 0xD70 */ s32 field_0xD70;
|
||||
/* 0xD74 */ s32 field_0xD74;
|
||||
/* 0xD78 */ u8 field_0xD78;
|
||||
/* 0xD79 */ u8 field_0xD79;
|
||||
/* 0xD7A */ u8 field_0xD7A;
|
||||
/* 0xD7B */ u8 field_0xD7B;
|
||||
/* 0xD7C */ u8 field_0xD7C;
|
||||
/* 0xD7D */ u8 field_0xD7D;
|
||||
/* 0xD7E */ u8 field_0xD7E;
|
||||
/* 0xD80 */ u32 field_0xD80;
|
||||
/* 0xD84 */ u8 field_0xD84;
|
||||
/* 0xD85 */ u8 field_0xD85;
|
||||
|
||||
static s8 game_life_point;
|
||||
}; // Size: 0xD88
|
||||
|
||||
class daNpc_Ji1_HIO_c : JORReflexible {
|
||||
public:
|
||||
daNpc_Ji1_HIO_c();
|
||||
virtual ~daNpc_Ji1_HIO_c() {}
|
||||
|
||||
public:
|
||||
/* Place member variables here */
|
||||
};
|
||||
/* 0x004 */ s8 field_0x04;
|
||||
/* 0x008 */ f32 field_0x08;
|
||||
/* 0x00C */ s16 field_0x0C;
|
||||
/* 0x00E */ s16 field_0x0E;
|
||||
/* 0x010 */ s16 field_0x10;
|
||||
/* 0x012 */ s16 field_0x12;
|
||||
/* 0x014 */ s16 field_0x14;
|
||||
/* 0x016 */ s16 field_0x16;
|
||||
/* 0x018 */ s16 field_0x18;
|
||||
/* 0x01A */ u8 field_0x1A;
|
||||
/* 0x01C */ f32 field_0x1C;
|
||||
/* 0x020 */ f32 field_0x20;
|
||||
/* 0x024 */ f32 field_0x24;
|
||||
/* 0x028 */ u8 field_0x28;
|
||||
/* 0x02C */ f32 field_0x2C;
|
||||
/* 0x030 */ u8 field_0x30;
|
||||
/* 0x034 */ f32 field_0x34;
|
||||
/* 0x038 */ f32 field_0x38;
|
||||
/* 0x03C */ f32 field_0x3C;
|
||||
/* 0x040 */ f32 field_0x40;
|
||||
/* 0x044 */ f32 field_0x44;
|
||||
/* 0x048 */ f32 field_0x48;
|
||||
/* 0x04C */ f32 field_0x4C;
|
||||
/* 0x050 */ f32 field_0x50;
|
||||
/* 0x054 */ s16 field_0x54[6];
|
||||
/* 0x060 */ s16 field_0x60[4];
|
||||
/* 0x068 */ u8 field_0x68;
|
||||
/* 0x06C */ f32 field_0x6C;
|
||||
/* 0x070 */ f32 field_0x70;
|
||||
/* 0x074 */ f32 field_0x74;
|
||||
/* 0x078 */ f32 field_0x78;
|
||||
/* 0x07C */ f32 field_0x7C;
|
||||
/* 0x080 */ f32 field_0x80;
|
||||
/* 0x084 */ f32 field_0x84;
|
||||
/* 0x088 */ u16 field_0x88;
|
||||
/* 0x08A */ u16 field_0x8A;
|
||||
/* 0x08C */ u16 field_0x8C;
|
||||
/* 0x08E */ u16 field_0x8E;
|
||||
/* 0x090 */ u16 field_0x90;
|
||||
/* 0x092 */ u16 field_0x92;
|
||||
/* 0x094 */ u16 field_0x94;
|
||||
/* 0x096 */ u16 field_0x96;
|
||||
/* 0x098 */ u16 field_0x98;
|
||||
/* 0x09A */ u16 field_0x9A;
|
||||
/* 0x09C */ u16 field_0x9C;
|
||||
/* 0x09E */ u16 field_0x9E;
|
||||
/* 0x0A0 */ u16 field_0xA0;
|
||||
/* 0x0A2 */ u8 field_0xA2;
|
||||
/* 0x0A4 */ f32 field_0xA4;
|
||||
/* 0x0A8 */ f32 field_0xA8;
|
||||
/* 0x0AC */ f32 field_0xAC;
|
||||
/* 0x0B0 */ f32 field_0xB0;
|
||||
/* 0x0B4 */ f32 field_0xB4;
|
||||
/* 0x0B8 */ u8 field_0xB8;
|
||||
/* 0x0BC */ f32 field_0xBC;
|
||||
/* 0x0C0 */ f32 field_0xC0;
|
||||
/* 0x0C4 */ cXyz field_0xC4[3];
|
||||
/* 0x0E8 */ s16 field_0xE8;
|
||||
/* 0x0EA */ s16 field_0xEA;
|
||||
/* 0x0EC */ s16 field_0xEC;
|
||||
/* 0x0EE */ s16 field_0xEE;
|
||||
/* 0x0F0 */ s16 field_0xF0;
|
||||
/* 0x0F2 */ s16 field_0xF2;
|
||||
/* 0x0F4 */ s16 field_0xF4;
|
||||
/* 0x0F6 */ s16 field_0xF6;
|
||||
/* 0x0F8 */ s16 field_0xF8;
|
||||
/* 0x0FA */ s16 field_0xFA;
|
||||
/* 0x0FC */ s16 field_0xFC;
|
||||
/* 0x0FE */ s16 field_0xFE;
|
||||
}; // Size: 0x100
|
||||
|
||||
#endif /* D_A_NPC_JI1_H */
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "d/d_a_obj.h"
|
||||
#include "SSystem/SComponent/c_angle.h"
|
||||
#include "SSystem/SComponent/c_phase.h"
|
||||
#include "m_Do/m_Do_mtx.h"
|
||||
|
||||
namespace daTsubo {
|
||||
class Act_c : public fopAc_ac_c {
|
||||
@@ -31,7 +32,20 @@ namespace daTsubo {
|
||||
void data() const {}
|
||||
void data_spec_boko(int) {}
|
||||
void is_switch() const {}
|
||||
void pos_init() {}
|
||||
void pos_init() {
|
||||
current.pos = home.pos;
|
||||
current.angle = home.angle;
|
||||
shape_angle = home.angle;
|
||||
|
||||
m688.Val(cSAngle::_0);
|
||||
m68A.Val(cSAngle::_0);
|
||||
m68C.Val(cSAngle::_0);
|
||||
m68E.Val(cSAngle::_0);
|
||||
m690.Val(cSAngle::_0);
|
||||
m692.Val(current.angle.y);
|
||||
|
||||
mDoMtx_identity(mPoseMtx);
|
||||
}
|
||||
void prmZ_get_swSave() const {}
|
||||
void prm_get_cull() const {}
|
||||
void prm_get_itemNo() const {}
|
||||
|
||||
@@ -204,7 +204,9 @@ public:
|
||||
u8 getCatchChgItem() { return mCatch.getChangeItem(); }
|
||||
void getCatghTarget() {}
|
||||
void offAleart() {}
|
||||
void revivalAleart() {}
|
||||
void revivalAleart() {
|
||||
clrFlag(0x80000000);
|
||||
}
|
||||
void LookRequest(fopAc_ac_c*, f32, f32, f32, s16, int) {}
|
||||
void Look2RequestF(fopAc_ac_c*, s16, int) {}
|
||||
void ZHintRequest(fopAc_ac_c*, int) {}
|
||||
|
||||
@@ -280,6 +280,7 @@ public:
|
||||
void setMessageCountNumber(s16 num) { mMsgCountNumber = num; }
|
||||
|
||||
s16 getMiniGameRupee() { return mMiniGameRupee; }
|
||||
void setMiniGameRupee(s16 count) { mMiniGameRupee = count; }
|
||||
void plusMiniGameRupee(s16 count) {
|
||||
if(mMiniGameRupee + count > 0) {
|
||||
mMiniGameRupee += count;
|
||||
@@ -638,10 +639,10 @@ public:
|
||||
/* 0x4A20 */ u8 mPlayerInfoBufferStageNo;
|
||||
/* 0x4A24 */ daAgb_c* mpAgb;
|
||||
/* 0x4A28 */ u32 mPlayerStatus[2][2];
|
||||
/* 0x4A38 */ u8 field_0x4A38[0x4A3A - 0x4A38];
|
||||
/* 0x4A38 */ u16 field_0x4A38;
|
||||
/* 0x4A3A */ u8 mMiniGameType;
|
||||
/* 0x4A3C */ s16 mMiniGameRupee;
|
||||
/* 0x4A3D */ u8 field_0x4A3E[0x4A40 - 0x4A3E];
|
||||
/* 0x4A3E */ u8 field_0x4A3E;
|
||||
/* 0x4A40 */ __d_timer_info_c mTimerInfo;
|
||||
/* 0x4A54 */ dDlst_window_c* mCurrentWindow;
|
||||
/* 0x4A58 */ view_class* mCurrentView;
|
||||
@@ -1922,6 +1923,10 @@ inline dAttention_c& dComIfGp_getAttention() {
|
||||
return g_dComIfG_gameInfo.play.getAttention();
|
||||
}
|
||||
|
||||
inline void dComIfGp_att_revivalAleart() {
|
||||
return dComIfGp_getAttention().revivalAleart();
|
||||
}
|
||||
|
||||
inline dDetect_c& dComIfGp_getDetect() {
|
||||
return g_dComIfG_gameInfo.play.getDetect();
|
||||
}
|
||||
@@ -2246,6 +2251,12 @@ inline u8 dComIfGp_getMiniGameType() {
|
||||
return g_dComIfG_gameInfo.play.getMiniGameType();
|
||||
}
|
||||
|
||||
inline void dComIfGp_endMiniGame(u16 param_1) {
|
||||
g_dComIfG_gameInfo.play.mMiniGameType = 0;
|
||||
g_dComIfG_gameInfo.play.field_0x4A38 ^= 1 << param_1 - 1; // what
|
||||
g_dComIfG_gameInfo.play.field_0x4A3E = 0;
|
||||
}
|
||||
|
||||
inline u8 dComIfGp_getAStatus() {
|
||||
return g_dComIfG_gameInfo.play.getAStatus();
|
||||
}
|
||||
@@ -2286,6 +2297,10 @@ inline s16 dComIfGp_getMiniGameRupee() {
|
||||
return g_dComIfG_gameInfo.play.getMiniGameRupee();
|
||||
}
|
||||
|
||||
inline void dComIfGp_setMiniGameRupee(s16 count) {
|
||||
return g_dComIfG_gameInfo.play.setMiniGameRupee(count);
|
||||
}
|
||||
|
||||
inline void dComIfGp_plusMiniGameRupee(s16 count) {
|
||||
g_dComIfG_gameInfo.play.plusMiniGameRupee(count);
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@ enum ItemTable {
|
||||
/* 0xA7 */ TINGLE_STATUE5,
|
||||
/* 0xA8 */ TINGLE_STATUE6,
|
||||
/* 0xA9 */ noentry169,
|
||||
/* 0xAA */ noentry170,
|
||||
/* 0xAA */ HURRICANE_SPIN,
|
||||
/* 0xAB */ MAX_RUPEE_UP1,
|
||||
/* 0xAC */ MAX_RUPEE_UP2,
|
||||
/* 0xAD */ MAX_BOMB_UP1,
|
||||
|
||||
@@ -392,6 +392,7 @@ void dKy_set_nexttime(f32);
|
||||
void dKy_instant_timechg(f32);
|
||||
void dKy_instant_rainchg();
|
||||
SND_INFLUENCE * dKy_Sound_get();
|
||||
void dKy_SordFlush_set(cXyz hitPos, int lightType);
|
||||
void dKy_Sound_set(cXyz i_pos, int param_1, unsigned int i_actorID, int param_3);
|
||||
void dKy_SordFlush_set(cXyz hitPos, int lightType);
|
||||
void dKy_itudemo_se();
|
||||
|
||||
+30
-3
@@ -106,6 +106,7 @@ public:
|
||||
};
|
||||
|
||||
class dNpc_EventCut_c {
|
||||
private:
|
||||
/* 0x00 */ char* mpEvtStaffName;
|
||||
/* 0x04 */ int mEvtStaffId;
|
||||
/* 0x08 */ fopAc_ac_c* mpActor;
|
||||
@@ -129,13 +130,13 @@ class dNpc_EventCut_c {
|
||||
/* 0x61 */ u8 mbNoTurn;
|
||||
/* 0x62 */ s16 mTurnSpeed;
|
||||
/* 0x64 */ u32 mTurnType;
|
||||
/* 0x68 */ u8* field_0x68;
|
||||
/* 0x68 */ dNpc_JntCtrl_c* mpJntCtrl;
|
||||
|
||||
public:
|
||||
dNpc_EventCut_c() {
|
||||
mpActor = 0;
|
||||
mpTalkActor = 0;
|
||||
field_0x68 = 0;
|
||||
mpJntCtrl = 0;
|
||||
}
|
||||
|
||||
void setActorInfo(char*, fopAc_ac_c*);
|
||||
@@ -155,6 +156,21 @@ public:
|
||||
void cutTalkMsgStart();
|
||||
void cutContinueTalkStart();
|
||||
void cutTalkMsgProc();
|
||||
|
||||
char* getActorName() {
|
||||
return mpEvtStaffName;
|
||||
}
|
||||
|
||||
bool getAttnFlag() {
|
||||
return mbAttention;
|
||||
}
|
||||
cXyz getAttnPos() {
|
||||
return mPos;
|
||||
}
|
||||
|
||||
void setJntCtrlPtr(dNpc_JntCtrl_c* ctrl) {
|
||||
mpJntCtrl = ctrl;
|
||||
}
|
||||
|
||||
static fopAc_ac_c* findActorCallBack(fopAc_ac_c*, void*);
|
||||
};
|
||||
@@ -196,12 +212,23 @@ public:
|
||||
void swing_horizone_init(s16 param_1, s16 param_2, s16 param_3, int param_4);
|
||||
void swing_horizone();
|
||||
void move();
|
||||
|
||||
dNpc_HeadAnm_c() {
|
||||
field_0x14 = 0.0f;
|
||||
field_0x18 = 0.0f;
|
||||
field_0x1C = 0.0f;
|
||||
field_0x1E = 0;
|
||||
field_0x20 = 0;
|
||||
field_0x00 = 0;
|
||||
field_0x02 = 0;
|
||||
field_0x04 = 0;
|
||||
}
|
||||
|
||||
typedef void (dNpc_HeadAnm_c::*swing_func)(void);
|
||||
|
||||
/* 0x00 */ s16 field_0x00;
|
||||
/* 0x02 */ s16 field_0x02;
|
||||
/* 0x04 */ u32 field_0x04;
|
||||
/* 0x04 */ s16 field_0x04;
|
||||
/* 0x08 */ swing_func mFunc;
|
||||
/* 0x14 */ f32 field_0x14;
|
||||
/* 0x18 */ f32 field_0x18;
|
||||
|
||||
@@ -105,4 +105,6 @@ public:
|
||||
|
||||
s32 dTimer_createStockTimer();
|
||||
|
||||
void dTimer_createTimer(int, u16, u8, u8, f32, f32, f32, f32);
|
||||
|
||||
#endif /* D_TIMER_H */
|
||||
|
||||
@@ -447,6 +447,8 @@ s32 fopAcM_createChild(s16 procName, unsigned int parentPId, u32 parameters, cXy
|
||||
int roomNo, csXyz* p_angle, cXyz* p_scale = NULL, s8 subType = -1,
|
||||
createFunc p_createFunc = NULL);
|
||||
|
||||
s32 fopAcM_createChild(char* pProcNameString, unsigned int parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc);
|
||||
|
||||
s32 fopAcM_createChildFromOffset(s16 procName, unsigned int parentProcID, u32 actorParams,
|
||||
cXyz* p_pos, int roomNo, csXyz* p_angle,
|
||||
cXyz* p_scale, s8 subType, createFunc p_createFunc);
|
||||
|
||||
@@ -102,4 +102,8 @@ void fopMsgM_messageSendOn();
|
||||
u32 fopMsgM_tactMessageSet();
|
||||
void fopMsgM_demoMsgFlagOn();
|
||||
|
||||
void fopMsgM_demoMsgFlagOn();
|
||||
void fopMsgM_demoMsgFlagOff();
|
||||
bool fopMsgM_demoMsgFlagCheck();
|
||||
|
||||
#endif
|
||||
|
||||
@@ -189,7 +189,7 @@ u8 daDitem_c::m_effect_type[0x100] = {
|
||||
/* TINGLE_STATUE5 */ 0x00,
|
||||
/* TINGLE_STATUE6 */ 0x00,
|
||||
/* noentry169 */ 0x04,
|
||||
/* noentry170 */ 0x04,
|
||||
/* HURRICANE_SPIN */ 0x04,
|
||||
/* MAX_RUPEE_UP1 */ 0x00,
|
||||
/* MAX_RUPEE_UP2 */ 0x00,
|
||||
/* MAX_BOMB_UP1 */ 0x00,
|
||||
|
||||
+2982
-117
File diff suppressed because it is too large
Load Diff
@@ -3206,7 +3206,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
|
||||
/* mHeapSize */ 0x0000
|
||||
},
|
||||
{
|
||||
// 0xAA: noentry170
|
||||
// 0xAA: HURRICANE_SPIN
|
||||
/* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON],
|
||||
/* mTexture */ NULL,
|
||||
/* mBmdIdx */ 0x0003,
|
||||
@@ -6796,7 +6796,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
|
||||
/* mHeapSize */ 0x0000
|
||||
},
|
||||
{
|
||||
// 0xAA: noentry170
|
||||
// 0xAA: HURRICANE_SPIN
|
||||
/* mArc */ NULL,
|
||||
/* mBmdIdx */ -1,
|
||||
/* mSrtIdx */ -1,
|
||||
@@ -9108,7 +9108,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = {
|
||||
0x00,
|
||||
},
|
||||
{
|
||||
// 0xAA: noentry170
|
||||
// 0xAA: HURRICANE_SPIN
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
|
||||
Reference in New Issue
Block a user