mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-27 16:12:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_pw fixes

Browse Source
This commit is contained in:
LagoLunatic
2024-03-18 19:15:15 -04:00
parent 4859b367a9
commit 7ce949c59c
6 changed files with 320 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_am.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 0x02E0 */ int mCurrBckIdx;
/* 0x02E4 */ uint mSwallowedActorPID;
/* 0x02E8 */ f32 mAreaRadius;
/* 0x02EC */ f32 m02EC;
/* 0x02EC */ f32 mCorrectionOffsetY;
/* 0x02F0 */ f32 mSpawnPosY;
/* 0x02F4 */ cXyz mEyeballPos;
/* 0x0300 */ cXyz mMouthPos;
include/d/actor/d_a_pw.h
+45 -39
View File
@@ -8,16 +8,23 @@
#include "d/d_particle.h"
#include "f_op/f_op_actor.h"
class pw_class : public fopEn_enemy_c {
public:
/* 0x2AC */ u8 m2AC[0x2B4 - 0x2AC];
/* 0x2B4 */ mDoExt_McaMorf* m2B4;
/* 0x2B8 */ u8 m2B8[0x2CC - 0x2B8];
/* 0x2AC */ request_of_phase_process_class mPhase;
/* 0x2B4 */ mDoExt_McaMorf* mpMorf;
/* 0x2B8 */ u8 m2B8[0x2BC - 0x2B8];
/* 0x2BC */ mDoExt_btpAnm* m2BC;
/* 0x2C0 */ mDoExt_brkAnm* m2C0;
/* 0x2C4 */ mDoExt_brkAnm* m2C4;
/* 0x2C8 */ mDoExt_brkAnm* m2C8;
/* 0x2CC */ cXyz m2CC;
/* 0x2D8 */ cXyz m2D8;
/* 0x2B8 */ u8 m2E4[0x32C - 0x2E4];
/* 0x2E4 */ cXyz m2E4;
/* 0x2F0 */ cXyz m2F0;
/* 0x2FC */ cXyz m2FC;
/* 0x308 */ cXyz m308;
/* 0x314 */ cXyz m314;
/* 0x320 */ cXyz m320;
/* 0x32C */ csXyz m32C[2];
/* 0x338 */ u8 mBehaviorType;
/* 0x339 */ bool mHoversAtInitialYPos;
@@ -26,58 +33,57 @@ public:
/* 0x33C */ u8 mHitByWhat;
/* 0x33D */ u8 m33D[0x33E - 0x33D];
/* 0x33E */ u8 m33E;
/* 0x33F */ u8 m33F[0x340 - 0x33F];
/* 0x33F */ u8 m33F;
/* 0x340 */ u8 m340;
/* 0x341 */ u8 m341;
/* 0x342 */ u8 m342;
/* 0x343 */ u8 m343;
/* 0x344 */ u8 m344;
/* 0x345 */ u8 m345;
/* 0x346 */ u8 m346;
/* 0x347 */ u8 m347;
/* 0x348 */ dPath* m348;
/* 0x349 */ u8 m349[0x358 - 0x349];
/* 0x358 */ u8 m358;
/* 0x346 */ s16 m346;
/* 0x348 */ dPath* mpPath;
/* 0x34C */ u8 m34C[0x358 - 0x34C];
/* 0x358 */ s8 mPathPntIdx;
/* 0x359 */ u8 mPathIndex;
/* 0x35A */ u8 m35A[0x366 - 0x35A];
/* 0x366 */ s16 m366;
/* 0x368 */ s16 m368;
/* 0x366 */ s16 mAction;
/* 0x368 */ s16 mState;
/* 0x36A */ u8 m36A[0x36C - 0x36A];
/* 0x36C */ uint mJalhallaParentId;
/* 0x370 */ uint m370;
/* 0x374 */ u32 m374;
/* 0x36C */ uint mJalhallaID;
/* 0x370 */ uint mKanteraID;
/* 0x374 */ int mBckIdx;
/* 0x378 */ s16 m378;
/* 0x37A */ u16 m37A;
/* 0x37A */ u8 m37C[0x380 - 0x37C];
/* 0x380 */ u16 m380;
/* 0x382 */ u16 m382;
/* 0x384 */ s16 m384; // Might be a s16[4] array?
/* 0x388 */ s16 m388;
/* 0x37A */ s16 m37A;
/* 0x37C */ s16 m37C;
/* 0x37E */ s16 m37E;
/* 0x380 */ s16 m380;
/* 0x382 */ s16 m382;
/* 0x384 */ s16 m384[4];
/* 0x38C */ s16 m38C;
/* 0x38E */ s16 m38E;
/* 0x390 */ u8 m390[0x39A - 0x390];
/* 0x390 */ s16 m390;
/* 0x392 */ u8 m392[0x398 - 0x392];
/* 0x398 */ s16 m398;
/* 0x39A */ s16 m39A;
/* 0x39C */ u16 m39C;
/* 0x39E */ u8 m39E[0x3A4 - 0x39E];
/* 0x39C */ s16 m39C;
/* 0x39E */ s16 m39E;
/* 0x3A0 */ f32 mCorrectionOffsetY;
/* 0x3A4 */ f32 m3A4;
/* 0x3A8 */ f32 mNoticeRange;
/* 0x3AC */ f32 m3AC;
/* 0x3B0 */ u8 m3B0[0x3BC - 0x3B0];
/* 0x3BC */ dBgS_AcchCir m3BC;
/* 0x3FC */ dBgS_Acch mBgsAcch;
/* 0x3B0 */ f32 m3B0;
/* 0x3B4 */ u8 m3B4[0x3BC - 0x3B4];
/* 0x3BC */ dBgS_AcchCir mAcchCir;
/* 0x3FC */ dBgS_ObjAcch mAcch;
/* 0x5C0 */ u8 m5C0[0x5C4 - 0x5C0];
/* 0x5C4 */ dPa_followEcallBack m5C4;
/* 0x5D8 */ actor_place mActorPlace;
/* 0x608 */ dCcD_GStts m608;
/* 0x628 */ dCcD_GObjInf m628;
/* 0x720 */ u8 m720[0x758 - 0x720];
/* 0x758 */ dCcD_GObjInf m758;
/* 0x850 */ u8 m850[0x884 - 0x850];
/* 0x5EC */ dCcD_Stts mStts;
/* 0x628 */ dCcD_Cyl mCyl;
/* 0x758 */ dCcD_Sph mSph;
/* 0x884 */ enemyice mEnemyIce;
/* 0xC3C */ u8 mC3C[0xCF8 - 0xC3C];
/* 0xCF8 */ dCcD_GStts mCF8;
/* 0xD18 */ dCcD_GObjInf mD18;
/* 0xE10 */ u8 mE10[0xE6C - 0xE10];
};
/* 0xC3C */ enemyfire mEnemyFire;
/* 0xE64 */ mDoExt_invisibleModel mInvisibleModel;
}; // Size: 0xE6C
#endif /* D_A_PW_H */
include/d/d_jnt_hit.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
return false;
}
bool isCylinder(int type) {
if (type == 0 || (u32)type-2 <= 1 || type == 5 || type == 7) {
if (type == 0 || type == 2 || type == 3 || type == 5 || type == 7) {
return true;
}
return false;