mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 22:11:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #502 from LagoLunatic/am

Browse Source 
d_a_am 50%
This commit is contained in:
Jasper St. Pierre
2023-10-03 15:44:50 -07:00
committed by GitHub
parent c99475338b 96c1c35281
commit 3cd8d61035
27 changed files with 1221 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DJoint.h
+2 -2
View File
@@ -140,7 +140,7 @@ private:
friend struct J3DJointFactory;
friend class J3DJointTree;
/* 0x14 */ u16 mJntNo;
/* 0x18 */ u16 mJntNo;
/* 0x1A */ u8 mKind;
/* 0x1B */ u8 mScaleCompensate;
/* 0x1C */ J3DTransformInfo mTransformInfo;
@@ -150,6 +150,6 @@ private:
/* 0x58 */ J3DMtxCalc* mMtxCalc;
/* 0x5C */ J3DMtxCalc* mOldMtxCalc;
/* 0x60 */ J3DMaterial* mMesh;
}; // Size: 0x54
}; // Size: 0x64
#endif /* J3DJOINT_H */
include/JSystem/JParticle/JPADraw.h
+2
View File
@@ -11,6 +11,8 @@ class JPAExtraShapeArc;
class JPASweepShapeArc;
class JPAExTexShapeArc;
class JPATextureResource;
class JPABaseEmitter;
class JPABaseParticle;
class JPADraw;
class JPADrawExecEmitterVisitor;
include/JSystem/JParticle/JPAEmitter.h
+13 -2
View File
@@ -28,7 +28,7 @@ template<typename T>
class JPACallBackBase {
public:
JPACallBackBase() {}
virtual ~JPACallBackBase();
virtual ~JPACallBackBase() {}
virtual void init(JPABaseEmitter*);
virtual void execute(JPABaseEmitter*);
@@ -36,6 +36,17 @@ public:
virtual void draw(JPABaseEmitter*);
};
template<typename T, typename U>
class JPACallBackBase2 {
public:
JPACallBackBase2() {}
virtual ~JPACallBackBase2() {}
virtual void init(JPABaseEmitter*, JPABaseParticle*);
virtual void execute(JPABaseEmitter*, JPABaseParticle*);
virtual void draw(JPABaseEmitter*, JPABaseParticle*);
};
class JPABaseEmitter {
public:
typedef void (JPABaseEmitter::*VolumeFunc)();
@@ -128,7 +139,7 @@ public:
/* 0x194 */ JSUPtrList* mpPtclVacList;
/* 0x198 */ JPADataBlockLinkInfo* mpDataLinkInfo;
/* 0x19C */ JPACallBackBase<JPABaseEmitter>* mpEmitterCallBack;
/* 0x1A0 */ JPACallBackBase2* mpParticleCallBack;
/* 0x1A0 */ JPACallBackBase2<JPABaseEmitter,JPABaseParticle>* mpParticleCallBack;
/* 0x1A4 */ JMath::TRandom_fast_ mRandomSeed;
/* 0x1A8 */ Mtx mGlobalRotation;
/* 0x1D8 */ JGeometry::TVec3<f32> mGlobalScale;
include/JSystem/JParticle/JPAParticle.h
+2 -2
View File
@@ -2,6 +2,7 @@
#define JPAPARTICLE_H
#include "JSystem/JSupport/JSUList.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/gx/GXStruct.h"
@@ -13,7 +14,6 @@ class JPAEmitterManager;
class JPAParticleCallBack;
class JPAResourceManager;
struct JPAEmitterWorkData;
struct JPACallBackBase2;
class JPABaseParticle {
public:
@@ -58,7 +58,7 @@ public:
/* 0xC2 */ s16 mRotateSpeed;
/* 0xC4 */ u8 field_0xC4[0xC6 - 0xC4];
/* 0xC6 */ u16 mTexIdx;
/* 0xC8 */ JPACallBackBase2* mpCallBack2;
/* 0xC8 */ JPACallBackBase2<JPABaseEmitter,JPABaseParticle>* mpCallBack2;
/* 0xCC */ u32 mFlags;
};
include/SSystem/SComponent/c_cc_d.h
+17 -7
View File
@@ -23,13 +23,23 @@ class cCcD_CylAttr;
class cCcD_SphAttr;
enum cCcD_ObjAtType {
/* 0x00000002 */ AT_TYPE_SWORD = (1 << 1),
/* 0x00000020 */ AT_TYPE_BOMB = (1 << 5),
/* 0x00000040 */ AT_TYPE_BOOMERANG = (1 << 6),
/* 0x00004000 */ AT_TYPE_NORMAL_ARROW = (1 << 14),
/* 0x00040000 */ AT_TYPE_FIRE_ARROW = (1 << 18),
/* 0x00080000 */ AT_TYPE_ICE_ARROW = (1 << 19),
/* 0x00100000 */ AT_TYPE_LIGHT_ARROW = (1 << 20),
/* 0x00000002 */ AT_TYPE_SWORD = (1 << 1),
/* 0x00000020 */ AT_TYPE_BOMB = (1 << 5),
/* 0x00000040 */ AT_TYPE_BOOMERANG = (1 << 6),
/* 0x00000080 */ AT_TYPE_BOKO_STICK = (1 << 7),
/* 0x00000100 */ AT_TYPE_WATER = (1 << 8),
/* 0x00000200 */ AT_TYPE_FIRE = (1 << 9),
/* 0x00000400 */ AT_TYPE_MACHETE = (1 << 10),
/* 0x00004000 */ AT_TYPE_NORMAL_ARROW = (1 << 14),
/* 0x00010000 */ AT_TYPE_SKULL_HAMMER = (1 << 16),
/* 0x00040000 */ AT_TYPE_FIRE_ARROW = (1 << 18),
/* 0x00080000 */ AT_TYPE_ICE_ARROW = (1 << 19),
/* 0x00100000 */ AT_TYPE_LIGHT_ARROW = (1 << 20),
/* 0x00200000 */ AT_TYPE_LEAF_WIND = (1 << 21),
/* 0x01000000 */ AT_TYPE_STALFOS_MACE = (1 << 24),
/* 0x04000000 */ AT_TYPE_DARKNUT_SWORD = (1 << 26),
/* 0x08000000 */ AT_TYPE_GRAPPLING_HOOK = (1 << 27),
/* 0x10000000 */ AT_TYPE_MOBLIN_SPEAR = (1 << 28),
};
class cCcD_ShapeAttr {
include/SSystem/SComponent/c_data_tbl.h
+2
View File
@@ -41,6 +41,8 @@ public:
u8 GetInf(int row, int col) const;
void Set(u32 fmtNum, char **pFmt, u32 nameNum, char **pName, u8* pData);
int GetNameIndex(const char* pName, int start) const { return mName.GetIndex(pName, start); }
cDT_Format mFmt;
cDT_Name mName;
include/c/c_damagereaction.h
+202
View File
@@ -0,0 +1,202 @@
#ifndef C_DAMAGEREACTION_H
#define C_DAMAGEREACTION_H
#include "d/d_cc_d.h"
#include "d/d_bg_s_acch.h"
#include "d/d_kankyo.h"
#include "d/d_particle.h"
#include "f_op/f_op_actor.h"
#include "m_Do/m_Do_ext.h"
struct enemyice {
public:
/* 0x000 */ fopAc_ac_c* mpActor;
/* 0x004 */ s16 mTotalNumFramesToRemainFrozen;
/* 0x006 */ u8 mNumFramesDyingToLightArrowsSoFar;
/* 0x007 */ u8 m007[0x008 - 0x007];
/* 0x008 */ f32 mYOffset;
/* 0x00C */ u8 m00C;
/* 0x00D */ u8 mState;
/* 0x00E */ s16 mNumFramesLeftToRemainFrozen;
/* 0x010 */ s16 m010;
/* 0x012 */ s16 m012;
/* 0x014 */ s16 m014;
/* 0x016 */ u8 m016[0x018 - 0x016];
/* 0x018 */ cXyz m018;
/* 0x024 */ f32 m024;
/* 0x028 */ f32 m028;
/* 0x02C */ f32 m02C;
/* 0x030 */ dCcD_Stts mStts;
/* 0x06C */ dCcD_Cyl mCyl;
/* 0x19C */ f32 mCylHeight;
/* 0x1A0 */ f32 mWallRadius;
/* 0x1A4 */ f32 mScaleXZ;
/* 0x1A8 */ f32 mScaleY;
/* 0x1AC */ f32 m1AC;
/* 0x1B0 */ u8 m1B0;
/* 0x1B1 */ u8 mDeathSwitch;
/* 0x1B2 */ u8 m1B2[0x1B4 - 0x1B2];
/* 0x1B4 */ dBgS_AcchCir mBgAcchCir;
/* 0x1F4 */ dBgS_ObjAcch mBgAcch;
};
STATIC_ASSERT(sizeof(enemyice) == 0x3B8);
struct enemyfire {
public:
/* 0x000 */ fopAc_ac_c* mpActor;
/* 0x004 */ s16 m004;
/* 0x006 */ u8 m006;
/* 0x007 */ u8 m007[0x008 - 0x007];
/* 0x008 */ s16 m008;
/* 0x00A */ u8 m00A[0x00C - 0x00A];
/* 0x00C */ mDoExt_McaMorf* mpMcaMorf;
/* 0x010 */ u8 m010[10];
/* 0x01A */ u8 m01A[0x01C - 0x01A];
/* 0x01C */ f32 m01C[10];
/* 0x044 */ u8 m044[0x080 - 0x044];
/* 0x080 */ cXyz m080;
/* 0x08C */ f32 m08C;
/* 0x090 */ f32 m090;
/* 0x094 */ f32 m094;
/* 0x098 */ f32 m098;
/* 0x09C */ u8 m09C[0x09D - 0x09C];
/* 0x09D */ char m09D;
/* 0x09E */ u8 m09E[0x0A0 - 0x09E];
/* 0x0A0 */ dCcD_Stts mStts;
/* 0x0DC */ dCcD_Sph mSph;
/* 0x208 */ LIGHT_INFLUENCE mLight;
};
STATIC_ASSERT(sizeof(enemyfire) == 0x228);
struct damagereaction {
public:
enum EnemyType {
TYPE_MOBLIN = 1,
TYPE_BOKOBLIN = 2,
TYPE_DARKNUT = 3,
};
/* 0x000 */ fopEn_enemy_c* mpEnemy;
/* 0x004 */ s16 m004;
/* 0x006 */ s16 mState;
/* 0x008 */ u16 mEnemyType;
/* 0x00A */ u8 m00A[0x00C - 0x00A];
/* 0x00C */ int mTimer;
/* 0x010 */ csXyz m010[20];
/* 0x088 */ csXyz m088[20];
/* 0x100 */ cXyz m100[20];
/* 0x1F0 */ cXyz m1F0[20];
/* 0x2E0 */ cXyz m2E0[20];
/* 0x3D0 */ u8 m3D0[0x410 - 0x3D0];
/* 0x410 */ int m410;
/* 0x414 */ u8 m414[0x418 - 0x414];
/* 0x418 */ int m418;
/* 0x41C */ u8 m41C[0x420 - 0x41C];
/* 0x420 */ int m420;
/* 0x424 */ int m424;
/* 0x428 */ f32 m428;
/* 0x42C */ cXyz m42C;
/* 0x438 */ int m438;
/* 0x43C */ u8 m43C[0x440 - 0x43C];
/* 0x440 */ s16 m440;
/* 0x442 */ s16 m442;
/* 0x444 */ s16 m444;
/* 0x446 */ u8 m446[0x448 - 0x446];
/* 0x448 */ s16 m448;
/* 0x44A */ u8 m44A[0x44C - 0x44A];
/* 0x44C */ cXyz m44C;
/* 0x458 */ cXyz m458;
/* 0x464 */ u8 m464[0x468 - 0x464];
/* 0x468 */ f32 m468;
/* 0x46C */ f32 m46C;
/* 0x470 */ f32 m470;
/* 0x474 */ f32 m474;
/* 0x478 */ f32 m478;
/* 0x47C */ int m47C;
/* 0x480 */ s16 m480;
/* 0x482 */ s16 m482;
/* 0x484 */ s16 m484;
/* 0x486 */ s16 m486;
/* 0x488 */ s16 m488;
/* 0x48A */ s16 m48A;
/* 0x48C */ csXyz m48C;
/* 0x492 */ u8 m492[0x496 - 0x492];
/* 0x496 */ s16 m496;
/* 0x498 */ s16 m498;
/* 0x49A */ s16 m49A;
/* 0x49C */ s16 m49C;
/* 0x49E */ s16 m49E;
/* 0x4A0 */ s16 m4A0;
/* 0x4A2 */ s16 m4A2;
/* 0x4A4 */ s16 m4A4;
/* 0x4A6 */ s16 m4A6;
/* 0x4A8 */ s16 m4A8;
/* 0x4AA */ s16 m4AA;
/* 0x4AC */ s16 m4AC;
/* 0x4AE */ s16 m4AE;
/* 0x4B0 */ s16 m4B0;
/* 0x4B2 */ s16 m4B2;
/* 0x4B4 */ s16 m4B4;
/* 0x4B6 */ s16 m4B6;
/* 0x4B8 */ s16 m4B8;
/* 0x4BA */ s16 m4BA;
/* 0x4BC */ s16 m4BC;
/* 0x4BE */ s16 m4BE;
/* 0x4C0 */ s16 m4C0;
/* 0x4C2 */ u8 m4C2[0x4C8 - 0x4C2];
/* 0x4C8 */ s16 m4C8[3];
/* 0x4CE */ s16 mInvincibleTimer;
/* 0x4D0 */ s16 m4D0;
/* 0x4D2 */ u8 m4D2[0x4D4 - 0x4D2];
/* 0x4D4 */ f32 m4D4;
/* 0x4D8 */ u8 m4D8[0x4DC - 0x4D8];
/* 0x4DC */ dBgS_AcchCir mAcchCir;
/* 0x51C */ dBgS_Acch mAcch;
/* 0x6E0 */ int m6E0;
/* 0x6E4 */ f32 mSpawnY;
/* 0x6E8 */ cXyz m6E8;
/* 0x6F4 */ cXyz m6F4[2];
/* 0x70C */ u8 m70C;
/* 0x70D */ u8 m70D;
/* 0x70E */ u8 m70E;
/* 0x70F */ u8 m70F[0x710 - 0x70F];
/* 0x710 */ u8 m710;
/* 0x711 */ u8 m711[0x712 - 0x711];
/* 0x712 */ u8 m712;
/* 0x713 */ u8 m713;
/* 0x714 */ u8 m714[0x71E - 0x714];
/* 0x71E */ s16 m71E;
/* 0x720 */ f32 mMaxFallDistance;
/* 0x724 */ dCcD_Stts mStts;
/* 0x760 */ cXyz mParticlePos;
/* 0x76C */ csXyz mParticleAngle;
/* 0x772 */ u8 m772[0x774 - 0x772];
/* 0x774 */ dPa_smokeEcallBack mParticleCallBack;
/* 0x794 */ s16 m794;
/* 0x796 */ u8 m796[0x7A0 - 0x796];
/* 0x7A0 */ cXyz m7A0;
/* 0x7AC */ u8 m7AC[0x7AE - 0x7AC];
/* 0x7AE */ s16 m7AE;
/* 0x7B0 */ u8 m7B0[0x7B2 - 0x7B0];
/* 0x7B2 */ s16 m7B2;
/* 0x7B4 */ u8 m7B4[0x7B8 - 0x7B4];
/* 0x7B8 */ int m7B8;
};
// STATIC_ASSERT(sizeof(damagereaction) == 0x7BC);
void ice_bg_check(enemyice*);
BOOL enemy_ice(enemyice*);
void enemy_fire(enemyfire*);
void enemy_fire_remove(enemyfire*);
void enemy_piyo_set(fopAc_ac_c*);
void wall_angle_get(fopAc_ac_c*, short);
void dr_body_bg_check(damagereaction*);
void dr_joint_bg_check(damagereaction*);
void kado_check(damagereaction*);
void hang_ang_get(damagereaction*);
void dr_damage_set(damagereaction*);
void dr_damage_anime(damagereaction*);
void dr_matrix_set(damagereaction*);
void damage_reaction(damagereaction*);
#endif /* C_DAMAGEREACTION_H */
include/d/actor/d_a_item.h
-2
View File
@@ -9,8 +9,6 @@ class daItem_c : public daItemBase_c {
public:
typedef void (daItem_c::*daItem_c_ModeFunc)();
daItem_c() : mPtclFollowCb(0, 0), mPtclSmokeCb(1) {}
float getYOffset();
void set_mtx();
void set_mtx_base(J3DModel*, cXyz, csXyz);
include/d/actor/d_a_player.h
+1
View File
@@ -94,6 +94,7 @@ public:
s16 getBodyAngleX() { return mBodyAngle.x; }
s16 getBodyAngleY() { return mBodyAngle.y; }
void changeDemoMoveAngle(s16 angle) { mDemo.setMoveAngle(angle); }
u8 getCutType() const { return mAttackState; }
virtual MtxP getLeftHandMatrix() = 0;
virtual MtxP getRightHandMatrix() = 0;
include/d/actor/d_a_player_link.h
-5
View File
@@ -97,11 +97,6 @@ public:
/* 0x0 */ u8 field_0x0[0x28];
};
class dPa_cutTurnEcallBack_c {
public:
/* 0x0 */ u8 field_0x0[0x10];
};
class daPy_waterDropEcallBack_c {
public:
void execute(JPABaseEmitter*);
include/d/d_bg_s_acch.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
void ClrWallHit();
void SetWallR(f32);
void CalcWallRR();
void SetWall(f32, f32);
void SetWall(f32 i_halfHeight, f32 i_radius);
void SetWallHDirect(f32);
virtual ~dBgS_AcchCir() {}
include/d/d_com_inf_game.h
+37 -1
View File
@@ -18,6 +18,7 @@
#include "d/d_wood.h"
#include "d/d_demo.h"
#include "d/d_timer.h"
#include "SSystem/SComponent/c_data_tbl.h"
class JKRArchive;
class JKRExpHeap;
@@ -54,11 +55,42 @@ public:
/* 0x10 */ u8 mTimerType;
};
class dADM_CharTbl : public cDT {
public:
/* 0x28 */ s32 mIndex_ARG;
/* 0x2C */ s32 mIndex_N_ITEM0;
/* 0x30 */ s32 mIndex_N_ITEM1;
/* 0x34 */ s32 mIndex_N_ITEM2;
/* 0x38 */ s32 mIndex_N_ITEM3;
/* 0x3C */ s32 mIndex_N_ITEM4;
/* 0x40 */ s32 mIndex_N_ITEM5;
/* 0x44 */ s32 mIndex_N_ITEM6;
/* 0x48 */ s32 mIndex_N_ITEM7;
/* 0x4C */ s32 mIndex_N_ITEM8;
/* 0x50 */ s32 mIndex_N_ITEM9;
/* 0x54 */ s32 mIndex_N_ITEM10;
/* 0x58 */ s32 mIndex_N_ITEM11;
/* 0x5C */ s32 mIndex_N_ITEM12;
/* 0x60 */ s32 mIndex_N_ITEM13;
/* 0x64 */ s32 mIndex_N_ITEM14;
/* 0x68 */ s32 mIndex_N_ITEM15;
/* 0x6C */ s32 mIndex_percent;
/* 0x70 */ s32 mIndex_ITEM0;
/* 0x74 */ s32 mIndex_ITEM1;
/* 0x78 */ s32 mIndex_ITEM2;
/* 0x7C */ s32 mIndex_ITEM3;
/* 0x80 */ s32 mIndex_ITEM4;
/* 0x84 */ s32 mIndex_ITEM5;
/* 0x88 */ s32 mIndex_ITEM6;
/* 0x8C */ s32 mIndex_ITEM7;
};
STATIC_ASSERT(sizeof(dADM_CharTbl) == 0x90);
class dADM {
public:
/* 0x00 */ int mBlockCount;
/* 0x04 */ void* mpData;
/* 0x08 */ u8 mCharTbl[0x90];
/* 0x08 */ dADM_CharTbl mCharTbl;
public:
dADM();
@@ -1186,6 +1218,10 @@ inline u8 dComIfGp_getMiniGameType() {
inline dDlst_window_c * dComIfGp_getWindow(int idx) { return &g_dComIfG_gameInfo.play.mDlstWindow[idx]; }
inline dADM_CharTbl* dComIfGp_CharTbl() {
return &g_dComIfG_gameInfo.play.mADM.mCharTbl;
}
/**
* === EVENT ===*/
include/d/d_jnt_hit.h
+14 -5
View File
@@ -3,12 +3,13 @@
#include "global.h"
#include "SSystem/SComponent/c_xyz.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
struct __jnt_hit_data_c {
public:
/* 0x0 */ s16 mJointIndex;
/* 0x2 */ s16 field_0x2;
/* 0x0 */ s16 field_0x0;
/* 0x2 */ s16 mJointIndex;
/* 0x4 */ f32 field_0x4;
/* 0x8 */ cXyz* field_0x8;
};
@@ -16,9 +17,9 @@ public:
class JntHit_c {
public:
void CreateInit();
void CylHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, float);
void Cyl2HitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, float);
void SphHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, float);
void CylHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, f32);
void Cyl2HitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, f32);
void SphHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, f32);
void HitBufferUpdate(int*, cXyz*, int, csXyz*, cXyz*);
s32 searchJntHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*);
@@ -34,4 +35,12 @@ public:
/* 0x1A */ u8 field_0x1A[0x20 - 0x1A];
};
class JntHit_HIO_c {
public:
JntHit_HIO_c();
virtual ~JntHit_HIO_c();
};
JntHit_c* JntHit_create(J3DModel* model, __jnt_hit_data_c* jntHitData, s16 hitDataCount);
#endif /* D_JNT_HIT_H */
include/d/d_particle.h
+140 -15
View File
@@ -2,10 +2,12 @@
#define D_PARTICLE
#include "JSystem/J3DGraphBase/J3DVertex.h"
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "JSystem/JGeometry.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "f_pc/f_pc_node.h"
#include "m_Do/m_Do_ext.h"
class mDoDvdThd_toMainRam_c;
class dPa_levelEcallBack;
@@ -20,8 +22,8 @@ struct csXyz;
class dPa_simpleData_c {
public:
~dPa_simpleData_c();
dPa_simpleData_c();
~dPa_simpleData_c() {}
/* 0x00 */ Vec mPos;
/* 0x0C */ GXColor mPrmColor;
@@ -32,12 +34,13 @@ public:
class dPa_levelEcallBack : public JPACallBackBase<JPABaseEmitter*> {
public:
virtual ~dPa_levelEcallBack() {}
virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
};
class dPa_followEcallBack : public dPa_levelEcallBack {
public:
dPa_followEcallBack(u8, u8);
virtual ~dPa_followEcallBack();
dPa_followEcallBack(u8=0, u8=0);
virtual ~dPa_followEcallBack() {}
virtual void execute(JPABaseEmitter*);
virtual void draw(JPABaseEmitter*);
@@ -45,6 +48,7 @@ public:
virtual void end();
JPABaseEmitter* getEmitter() { return mpEmitter; }
void setRateOff(u8 param_0) { field_0x11 = param_0; }
/* 0x04 */ JPABaseEmitter* mpEmitter;
/* 0x08 */ u8 field_0x08[0x10 - 0x08];
@@ -58,8 +62,14 @@ STATIC_ASSERT(sizeof(dPa_followEcallBack) == 0x14);
class dPa_smokeEcallBack : public dPa_followEcallBack {
public:
dPa_smokeEcallBack(u8);
virtual ~dPa_smokeEcallBack();
dPa_smokeEcallBack(u8=1);
dPa_smokeEcallBack(u8, u8, u8, u8);
dPa_smokeEcallBack(const _GXColor&, dKy_tevstr_c*, u8);
virtual ~dPa_smokeEcallBack() {}
virtual void draw(JPABaseEmitter*);
virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
virtual void end();
/* 0x14 */ s8 field_0x14;
/* 0x15 */ u8 field_0x15;
@@ -70,10 +80,10 @@ public:
STATIC_ASSERT(sizeof(dPa_smokeEcallBack) == 0x20);
class dPa_simpleEcallBack {
class dPa_simpleEcallBack : public JPACallBackBase<JPABaseEmitter*> {
public:
dPa_simpleEcallBack();
~dPa_simpleEcallBack();
virtual ~dPa_simpleEcallBack() {}
void executeAfter(JPABaseEmitter*);
void draw(JPABaseEmitter*);
@@ -81,7 +91,6 @@ public:
void createEmitter(JPAEmitterManager*);
void set(cXyz const*, u8, GXColor const&, GXColor const&, int);
/* 0x000 */ void* vtbl;
/* 0x004 */ JPABaseEmitter* mpBaseEmitter;
/* 0x008 */ u16 mResID;
/* 0x00A */ u8 mGrpID;
@@ -98,7 +107,7 @@ public:
void executeAfter(JPABaseEmitter*);
void draw(JPABaseEmitter*);
~dPa_waveEcallBack();
virtual ~dPa_waveEcallBack() {}
/* 0x04 */ s16 mState;
/* 0x06 */ s16 mFadeTimer;
@@ -110,7 +119,7 @@ public:
/* 0x1C */ cXyz mCollapsePos[2];
/* 0x34 */ cXyz* mpPos;
/* 0x38 */ csXyz* mpRot;
/* 0x3C */ cXyz mRotMtx[3];
// /* 0x3C */ cXyz mRotMtx[3];
/* 0x60 */ JPABaseEmitter* mpBaseEmitter;
};
@@ -120,7 +129,7 @@ public:
void remove();
void execute(JPABaseEmitter*);
~dPa_splashEcallBack();
virtual ~dPa_splashEcallBack() {}
/* 0x04 */ s16 mState;
/* 0x08 */ f32 mScaleTimer;
@@ -138,12 +147,12 @@ public:
void execute(JPABaseEmitter*);
void draw(JPABaseEmitter*);
~dPa_trackEcallBack();
virtual ~dPa_trackEcallBack() {}
/* 0x04 */ s16 mState;
/* 0x08 */ f32 mBaseY;
/* 0x0C */ f32 mMinY;
/* 0x10 */ cXyz mPos[3];
// /* 0x10 */ cXyz mPos[3];
/* 0x34 */ cXyz* mpPos;
/* 0x38 */ csXyz* mpRot;
/* 0x3C */ f32 mExTransY;
@@ -156,7 +165,7 @@ public:
class dPa_rippleEcallBack : public dPa_levelEcallBack {
public:
dPa_rippleEcallBack() { mpBaseEmitter = NULL; }
~dPa_rippleEcallBack();
virtual ~dPa_rippleEcallBack() {}
void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
void end();
@@ -169,6 +178,122 @@ public:
/* 0x10 */ f32 mRate;
};
class dPa_modelEmitter_c {
public:
u8 temp[0xC];
dPa_modelEmitter_c();
virtual ~dPa_modelEmitter_c() {}
};
class JKRSolidHeap;
class dPa_J3DmodelEmitter_c : public dPa_modelEmitter_c {
public:
u8 temp2[4];
JKRSolidHeap* mpHeap;
dPa_J3DmodelEmitter_c(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c&, J3DAnmTexPattern*, unsigned short, int);
virtual ~dPa_J3DmodelEmitter_c();
virtual void draw();
};
class dPa_J3Dmodel_c {
public:
dPa_J3Dmodel_c();
};
class dPa_smokePcallBack : public JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*> {
public:
dPa_smokePcallBack();
virtual ~dPa_smokePcallBack() {}
virtual void execute(JPABaseEmitter*, JPABaseParticle*);
virtual void draw(JPABaseEmitter*, JPABaseParticle*);
};
class dPa_selectTexEcallBack : public dPa_levelEcallBack {
public:
dPa_selectTexEcallBack();
virtual ~dPa_selectTexEcallBack() {}
virtual void draw(JPABaseEmitter*);
virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8);
};
class dPa_windPcallBack : JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*> {
public:
dPa_windPcallBack();
virtual ~dPa_windPcallBack() {}
virtual void execute(JPABaseEmitter*, JPABaseParticle*);
};
class dPa_singleRippleEcallBack : public dPa_levelEcallBack {
public:
dPa_singleRippleEcallBack();
virtual ~dPa_singleRippleEcallBack() {}
virtual void execute(JPABaseEmitter*);
virtual void draw(JPABaseEmitter*);
virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8);
};
class dPa_ripplePcallBack : JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*> {
public:
dPa_ripplePcallBack();
virtual ~dPa_ripplePcallBack() {}
virtual void execute(JPABaseEmitter*, JPABaseParticle*);
virtual void draw(JPABaseEmitter*, JPABaseParticle*);
};
class dPa_cutTurnEcallBack_c : public dPa_levelEcallBack {
public:
dPa_cutTurnEcallBack_c();
virtual ~dPa_cutTurnEcallBack_c() {}
virtual void executeAfter(JPABaseEmitter*);
virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8);
void end();
};
class dPa_stripesEcallBack : public dPa_levelEcallBack {
public:
dPa_stripesEcallBack();
virtual ~dPa_stripesEcallBack() {}
virtual void draw(JPABaseEmitter*);
virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8);
};
class dPa_kageroEcallBack : public JPACallBackBase<JPABaseEmitter*> {
public:
dPa_kageroEcallBack();
virtual ~dPa_kageroEcallBack() {}
virtual void draw(JPABaseEmitter*);
};
class dPa_bombSmokeEcallBack : public dPa_levelEcallBack {
public:
dPa_bombSmokeEcallBack();
virtual ~dPa_bombSmokeEcallBack() {}
virtual void execute(JPABaseEmitter*);
virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8);
};
class dPa_setColorEcallBack : public dPa_levelEcallBack {
public:
dPa_setColorEcallBack();
virtual ~dPa_setColorEcallBack() {}
virtual void draw(JPABaseEmitter*);
virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8);
};
class dPa_modelControl_c {
public:
dPa_modelControl_c(J3DModelData*);
@@ -208,7 +333,7 @@ public:
/* 0x78 */ void* field_0x78;
/* 0x7C */ void* field_0x7c;
/* 0x80 */ void* field_0x80;
/* 0x84 */ J3DVertexData mVertexData;
// /* 0x84 */ J3DVertexData mVertexData;
};
class dPa_control_c {
include/d/d_snap.h
+17 -1
View File
@@ -1,7 +1,23 @@
#ifndef D_SNAP_H
#define D_SNAP_H
void dSnap_DebugDraw();
#include "f_op/f_op_actor.h"
class dSnap_Obj;
void dSnap_PhotoIndex2TableIndex(int);
void dSnap_GetFigRoomId(int);
void dSnap_MatDl();
void dSnap_AlphaClearDL();
void dSnap_Create();
void dSnap_ReleaseShutter();
void dSnap_Execute();
void dSnap_GetResult();
void dSnap_GetResultDetail();
void dSnap_RegistSnapObj(dSnap_Obj&);
void dSnap_RegistFig(unsigned char, fopAc_ac_c*, float, float, float);
void dSnap_RegistFig(unsigned char, fopAc_ac_c*, const Vec&, short, float, float, float);
void dSnap_DebugDraw();
void dSnap_Delete();
#endif /* D_SNAP_H */
include/f_op/f_op_actor.h
+21 -1
View File
@@ -249,7 +249,27 @@ public:
STATIC_ASSERT(sizeof(fopAc_ac_c) == 0x290);
class fopEn_enemy_c;
class fopEn_enemy_c : public fopAc_ac_c {
public:
enum ParryOpeningType {
OPENING_NONE = 0,
OPENING_JUMP_PARRY = 1,
OPENING_ROLL_PARRY = 2,
OPENING_VERTICAL_JUMP_PARRY = 3,
OPENING_GANONDORF_FINISHER_PARRY = 4,
};
/* 0x290 */ f32 m290;
/* 0x294 */ f32 m294;
/* 0x298 */ f32 m298;
/* 0x29C */ f32 m29C;
/* 0x2A0 */ f32 m2A0;
/* 0x2A4 */ f32 m2A4;
/* 0x2A8 */ u8 mCurrParryOpeningType;
/* 0x2A9 */ u8 field_2A9[0x2AC - 0x2A9];
};
STATIC_ASSERT(sizeof(fopEn_enemy_c) == 0x2AC);
s32 fopAc_IsActor(void* actor);
include/f_op/f_op_actor_mng.h
+2
View File
@@ -498,6 +498,8 @@ fopAc_ac_c* fopAcM_searchFromName4Event(char* name, s16 eventID);
s32 fopAcM_getWaterY(const cXyz*, f32*);
void fpoAcM_relativePos(fopAc_ac_c* actor, cXyz* p_inPos, cXyz* p_outPos);
void fopAcM_setGbaName(fopAc_ac_c* i_this, u8 itemNo, u8 gbaName0, u8 gbaName1);
inline void make_prm_warp_hole(u32* actorParams, u8 p1, u8 p2, u8 p3) {
u32 pp1 = (p3 << 0x8);
u32 pp2 = (p2 << 0x10);
include/m_Do/m_Do_ext.h
+1 -1
View File
@@ -279,7 +279,7 @@ public:
void calc();
void calc(u16);
void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
void setAnm(J3DAnmTransform* bckAnm, int loopMode, f32 morf, f32 speed, f32, f32, void* soundAnm);
void setMorf(f32);
J3DModel* getModel() { return mpModel; }
void setFrame(f32 frame) { mFrameCtrl.setFrame(frame); }
include/m_Do/m_Do_mtx.h
+12
View File
@@ -65,6 +65,18 @@ inline void cMtx_ZrotM(Mtx mtx, s16 z) {
mDoMtx_ZrotM(mtx, z);
}
inline void cMtx_XrotS(Mtx mtx, s16 x) {
mDoMtx_XrotS(mtx, x);
}
inline void cMtx_YrotS(Mtx mtx, s16 y) {
mDoMtx_YrotS(mtx, y);
}
inline void cMtx_ZrotS(Mtx mtx, s16 z) {
mDoMtx_ZrotS(mtx, z);
}
inline void cMtx_lookAt(Mtx param_0, const Vec* param_1, const Vec* param_2, s16 param_3) {
mDoMtx_lookAt(param_0, param_1, param_2, param_3);
}
src/c/c_damagereaction.cpp
+1 -166
View File
@@ -12,12 +12,7 @@ void ice_bg_check(enemyice*) {
}
/* 8001C0B4-8001CD7C .text enemy_ice__FP8enemyice */
void enemy_ice(enemyice*) {
/* Nonmatching */
}
/* 8001CD7C-8001CDB8 .text __dt__5csXyzFv */
csXyz::~csXyz() {
BOOL enemy_ice(enemyice*) {
/* Nonmatching */
}
@@ -41,86 +36,16 @@ void wall_angle_get(fopAc_ac_c*, short) {
/* Nonmatching */
}
/* 8001D890-8001D9BC .text __dt__11dBgS_LinChkFv */
dBgS_LinChk::~dBgS_LinChk() {
/* Nonmatching */
}
/* 8001D9BC-8001DA5C .text __dt__8dBgS_ChkFv */
dBgS_Chk::~dBgS_Chk() {
/* Nonmatching */
}
/* 8001DA5C-8001DAB8 .text __dt__15dBgS_GrpPassChkFv */
dBgS_GrpPassChk::~dBgS_GrpPassChk() {
/* Nonmatching */
}
/* 8001DAB8-8001DB00 .text __dt__15cBgS_GrpPassChkFv */
cBgS_GrpPassChk::~cBgS_GrpPassChk() {
/* Nonmatching */
}
/* 8001DB00-8001DB5C .text __dt__16dBgS_PolyPassChkFv */
dBgS_PolyPassChk::~dBgS_PolyPassChk() {
/* Nonmatching */
}
/* 8001DB5C-8001DBA4 .text __dt__16cBgS_PolyPassChkFv */
cBgS_PolyPassChk::~cBgS_PolyPassChk() {
/* Nonmatching */
}
/* 8001DBA4-8001DC38 .text __dt__11cBgS_LinChkFv */
cBgS_LinChk::~cBgS_LinChk() {
/* Nonmatching */
}
/* 8001DC38-8001DC80 .text __dt__8cM3dGLinFv */
cM3dGLin::~cM3dGLin() {
/* Nonmatching */
}
/* 8001DC80-8001DCC8 .text __dt__13cBgS_PolyInfoFv */
cBgS_PolyInfo::~cBgS_PolyInfo() {
/* Nonmatching */
}
/* 8001DCC8-8001E244 .text dr_body_bg_check__FP14damagereaction */
void dr_body_bg_check(damagereaction*) {
/* Nonmatching */
}
/* 8001E244-8001E3AC .text __dt__18dBgS_ObjGndChk_SplFv */
dBgS_ObjGndChk_Spl::~dBgS_ObjGndChk_Spl() {
/* Nonmatching */
}
/* 8001E3AC-8001E4EC .text __dt__14dBgS_ObjGndChkFv */
dBgS_ObjGndChk::~dBgS_ObjGndChk() {
/* Nonmatching */
}
/* 8001E4EC-8001E604 .text __dt__11dBgS_GndChkFv */
dBgS_GndChk::~dBgS_GndChk() {
/* Nonmatching */
}
/* 8001E604-8001E684 .text __dt__11cBgS_GndChkFv */
cBgS_GndChk::~cBgS_GndChk() {
/* Nonmatching */
}
/* 8001E684-8001F6A0 .text dr_joint_bg_check__FP14damagereaction */
void dr_joint_bg_check(damagereaction*) {
/* Nonmatching */
}
/* 8001F6A0-8001F808 .text __dt__20dBgS_ObjGndChk_YoganFv */
dBgS_ObjGndChk_Yogan::~dBgS_ObjGndChk_Yogan() {
/* Nonmatching */
}
/* 8001F808-8001FBA8 .text kado_check__FP14damagereaction */
void kado_check(damagereaction*) {
/* Nonmatching */
@@ -150,93 +75,3 @@ void dr_matrix_set(damagereaction*) {
void damage_reaction(damagereaction*) {
/* Nonmatching */
}
/* 80022710-80022718 .text @20@__dt__11cBgS_LinChkFv */
void @20@__dt__11cBgS_LinChkFv {
/* Nonmatching */
}
/* 80022718-80022720 .text @12@__dt__8dBgS_ChkFv */
void @12@__dt__8dBgS_ChkFv {
/* Nonmatching */
}
/* 80022720-80022728 .text @20@__dt__11dBgS_LinChkFv */
void @20@__dt__11dBgS_LinChkFv {
/* Nonmatching */
}
/* 80022728-80022730 .text @100@__dt__11dBgS_LinChkFv */
void @100@__dt__11dBgS_LinChkFv {
/* Nonmatching */
}
/* 80022730-80022738 .text @88@__dt__11dBgS_LinChkFv */
void @88@__dt__11dBgS_LinChkFv {
/* Nonmatching */
}
/* 80022738-80022740 .text @20@__dt__11dBgS_GndChkFv */
void @20@__dt__11dBgS_GndChkFv {
/* Nonmatching */
}
/* 80022740-80022748 .text @76@__dt__11dBgS_GndChkFv */
void @76@__dt__11dBgS_GndChkFv {
/* Nonmatching */
}
/* 80022748-80022750 .text @64@__dt__11dBgS_GndChkFv */
void @64@__dt__11dBgS_GndChkFv {
/* Nonmatching */
}
/* 80022750-80022758 .text @20@__dt__14dBgS_ObjGndChkFv */
void @20@__dt__14dBgS_ObjGndChkFv {
/* Nonmatching */
}
/* 80022758-80022760 .text @76@__dt__14dBgS_ObjGndChkFv */
void @76@__dt__14dBgS_ObjGndChkFv {
/* Nonmatching */
}
/* 80022760-80022768 .text @64@__dt__14dBgS_ObjGndChkFv */
void @64@__dt__14dBgS_ObjGndChkFv {
/* Nonmatching */
}
/* 80022768-80022770 .text @20@__dt__18dBgS_ObjGndChk_SplFv */
void @20@__dt__18dBgS_ObjGndChk_SplFv {
/* Nonmatching */
}
/* 80022770-80022778 .text @76@__dt__18dBgS_ObjGndChk_SplFv */
void @76@__dt__18dBgS_ObjGndChk_SplFv {
/* Nonmatching */
}
/* 80022778-80022780 .text @64@__dt__18dBgS_ObjGndChk_SplFv */
void @64@__dt__18dBgS_ObjGndChk_SplFv {
/* Nonmatching */
}
/* 80022780-80022788 .text @20@__dt__11cBgS_GndChkFv */
void @20@__dt__11cBgS_GndChkFv {
/* Nonmatching */
}
/* 80022788-80022790 .text @20@__dt__20dBgS_ObjGndChk_YoganFv */
void @20@__dt__20dBgS_ObjGndChk_YoganFv {
/* Nonmatching */
}
/* 80022790-80022798 .text @76@__dt__20dBgS_ObjGndChk_YoganFv */
void @76@__dt__20dBgS_ObjGndChk_YoganFv {
/* Nonmatching */
}
/* 80022798-800227A0 .text @64@__dt__20dBgS_ObjGndChk_YoganFv */
void @64@__dt__20dBgS_ObjGndChk_YoganFv {
/* Nonmatching */
}
src/d/actor/d_a_am.cpp
+634 -367
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_arrow.cpp
-3
View File
@@ -1304,6 +1304,3 @@ extern actor_process_profile_definition g_profile_ARROW = {
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
};
// Needed for the .data section to match.
static u8 dummy3[0x3C] = {};
src/d/actor/d_a_branch.cpp
+1 -1
View File
@@ -120,7 +120,7 @@ s32 daBranch_c::CreateHeap() {
0,
0,
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectIDRes(m_arcname, bckIds[i])),
0,
-1,
1.0f,
0,
-1,
src/d/actor/d_a_kaji.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ BOOL daKaji_c::CreateHeap() {
modelData,
NULL, NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Kaji", 0xE), // kj_wait.bck
2, 0.0f, 0, -1, 1,
J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0, -1, 1,
dComIfG_getObjectRes("Kaji", 0x8), // kj_wait.bas
0x00080000,
0x11000002
src/d/actor/d_a_mozo.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ s32 daMozo_c::CreateHeap() {
0,
0,
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Mozo", 6)),
2,
J3DFrameCtrl::LOOP_REPEAT_e,
1.0f,
0,
-1,
src/d/d_jnt_hit.cpp
+6 -6
View File
@@ -3,7 +3,7 @@
// Translation Unit: d_jnt_hit.cpp
//
#include "d_jnt_hit.h"
#include "d/d_jnt_hit.h"
#include "dolphin/types.h"
/* 80060BE8-80060C44 .text __ct__12JntHit_HIO_cFv */
@@ -17,17 +17,17 @@ void JntHit_c::CreateInit() {
}
/* 80060EC4-80061440 .text CylHitPosAngleOffset__8JntHit_cFP4cXyzP5csXyzP4cXyzP5csXyz4cXyz4cXyzf */
void JntHit_c::CylHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, float) {
void JntHit_c::CylHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, f32) {
/* Nonmatching */
}
/* 80061440-80061830 .text Cyl2HitPosAngleOffset__8JntHit_cFP4cXyzP5csXyzP4cXyzP5csXyz4cXyz4cXyzf */
void JntHit_c::Cyl2HitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, float) {
void JntHit_c::Cyl2HitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, f32) {
/* Nonmatching */
}
/* 80061830-80061ACC .text SphHitPosAngleOffset__8JntHit_cFP4cXyzP5csXyzP4cXyzP5csXyz4cXyzf */
void JntHit_c::SphHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, float) {
void JntHit_c::SphHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, f32) {
/* Nonmatching */
}
@@ -37,12 +37,12 @@ void JntHit_c::HitBufferUpdate(int*, cXyz*, int, csXyz*, cXyz*) {
}
/* 80061C28-800627DC .text searchJntHitPosAngleOffset__8JntHit_cFP4cXyzP5csXyzP4cXyzP5csXyz */
void JntHit_c::searchJntHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*) {
s32 JntHit_c::searchJntHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*) {
/* Nonmatching */
}
/* 800627DC-8006286C .text JntHit_create__FP8J3DModelP16__jnt_hit_data_cs */
void JntHit_create(J3DModel*, __jnt_hit_data_c*, short) {
JntHit_c* JntHit_create(J3DModel* model, __jnt_hit_data_c* jntHitData, s16 hitDataCount) {
/* Nonmatching */
}
src/d/d_particle.cpp
+91 -87
View File
@@ -3,7 +3,7 @@
// Translation Unit: d_particle.cpp
//
#include "d_particle.h"
#include "d/d_particle.h"
#include "dolphin/types.h"
/* 8007A4D8-8007A514 .text __ct__18dPa_modelEmitter_cFv */
@@ -16,14 +16,16 @@ dPa_J3DmodelEmitter_c::dPa_J3DmodelEmitter_c(JPABaseEmitter*, J3DModelData*, dKy
/* Nonmatching */
}
/* 8007A804-8007A84C .text __dt__18dPa_modelEmitter_cFv */
dPa_modelEmitter_c::~dPa_modelEmitter_c() {
/* Nonmatching */
}
// /* 8007A804-8007A84C .text __dt__18dPa_modelEmitter_cFv */
// dPa_modelEmitter_c::~dPa_modelEmitter_c() {
// /* Nonmatching */
// }
/* 8007A84C-8007A8C8 .text __dt__21dPa_J3DmodelEmitter_cFv */
dPa_J3DmodelEmitter_c::~dPa_J3DmodelEmitter_c() {
/* Nonmatching */
dPa_J3DmodelEmitter_c::~dPa_J3DmodelEmitter_c() {
if (mpHeap) {
mDoExt_destroySolidHeap(mpHeap);
}
}
/* 8007A8C8-8007ADC4 .text draw__21dPa_J3DmodelEmitter_cFv */
@@ -43,7 +45,13 @@ dPa_J3Dmodel_c::dPa_J3Dmodel_c() {
/* 8007AED8-8007AF64 .text __dt__18dPa_modelControl_cFv */
dPa_modelControl_c::~dPa_modelControl_c() {
/* Nonmatching */
node_class* node = parent.mpHead;
while (node) {
node_class* nextNode = node->mpNextNode;
cLs_SingleCut(node);
// delete node;
node = nextNode;
}
}
/* 8007AF64-8007B074 .text newModel__18dPa_modelControl_cFP12J3DModelData */
@@ -86,10 +94,10 @@ dPa_smokeEcallBack::dPa_smokeEcallBack(unsigned char) {
/* Nonmatching */
}
/* 8007B444-8007B4B0 .text __dt__19dPa_followEcallBackFv */
dPa_followEcallBack::~dPa_followEcallBack() {
/* Nonmatching */
}
// /* 8007B444-8007B4B0 .text __dt__19dPa_followEcallBackFv */
// dPa_followEcallBack::~dPa_followEcallBack() {
// /* Nonmatching */
// }
/* 8007B4B0-8007B558 .text __ct__18dPa_smokeEcallBackFUcUcUcUc */
dPa_smokeEcallBack::dPa_smokeEcallBack(unsigned char, unsigned char, unsigned char, unsigned char) {
@@ -106,15 +114,15 @@ void dPa_smokeEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signe
/* Nonmatching */
}
/* 8007B698-8007B6F4 .text __dt__18dPa_smokePcallBackFv */
dPa_smokePcallBack::~dPa_smokePcallBack() {
/* Nonmatching */
}
// /* 8007B698-8007B6F4 .text __dt__18dPa_smokePcallBackFv */
// dPa_smokePcallBack::~dPa_smokePcallBack() {
// /* Nonmatching */
// }
/* 8007B6F4-8007B73C .text __dt__54JPACallBackBase2<P14JPABaseEmitter,P15JPABaseParticle>Fv */
JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::~JPACallBackBase2() {
/* Nonmatching */
}
// /* 8007B6F4-8007B73C .text __dt__54JPACallBackBase2<P14JPABaseEmitter,P15JPABaseParticle>Fv */
// JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::~JPACallBackBase2() {
// /* Nonmatching */
// }
/* 8007B73C-8007B804 .text initiateLighting__FR11_GXColorS10R8_GXColorR8_GXColor */
void initiateLighting(_GXColorS10&, _GXColor&, _GXColor&) {
@@ -158,13 +166,14 @@ void dPa_selectTexEcallBack::draw(JPABaseEmitter*) {
/* 8007C3B0-8007C420 .text __ct__19dPa_simpleEcallBackFv */
dPa_simpleEcallBack::dPa_simpleEcallBack() {
/* Nonmatching */
mpBaseEmitter = NULL;
mCount = 0;
}
/* 8007C420-8007C45C .text __dt__16dPa_simpleData_cFv */
dPa_simpleData_c::~dPa_simpleData_c() {
/* Nonmatching */
}
// /* 8007C420-8007C45C .text __dt__16dPa_simpleData_cFv */
// dPa_simpleData_c::~dPa_simpleData_c() {
// /* Nonmatching */
// }
/* 8007C45C-8007C460 .text __ct__16dPa_simpleData_cFv */
dPa_simpleData_c::dPa_simpleData_c() {
@@ -176,10 +185,10 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter*) {
/* Nonmatching */
}
/* 8007C618-8007C674 .text __dt__17dPa_windPcallBackFv */
dPa_windPcallBack::~dPa_windPcallBack() {
/* Nonmatching */
}
// /* 8007C618-8007C674 .text __dt__17dPa_windPcallBackFv */
// dPa_windPcallBack::~dPa_windPcallBack() {
// /* Nonmatching */
// }
/* 8007C674-8007C6EC .text draw__19dPa_simpleEcallBackFP14JPABaseEmitter */
void dPa_simpleEcallBack::draw(JPABaseEmitter*) {
@@ -211,10 +220,10 @@ dPa_control_c::dPa_control_c() {
/* Nonmatching */
}
/* 8007C9A4-8007CA28 .text __dt__19dPa_simpleEcallBackFv */
dPa_simpleEcallBack::~dPa_simpleEcallBack() {
/* Nonmatching */
}
// /* 8007C9A4-8007CA28 .text __dt__19dPa_simpleEcallBackFv */
// dPa_simpleEcallBack::~dPa_simpleEcallBack() {
// /* Nonmatching */
// }
/* 8007CA28-8007CA30 .text getRM_ID__13dPa_control_cFUs */
void dPa_control_c::getRM_ID(unsigned short) {
@@ -277,7 +286,7 @@ void dPa_control_c::draw(JPADrawInfo*, unsigned char) {
}
/* 8007D1DC-8007D378 .text set__13dPa_control_cFUcUsPC4cXyzPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyz */
void dPa_control_c::set(unsigned char, unsigned short, const cXyz*, const csXyz*, const cXyz*, unsigned char, dPa_levelEcallBack*, signed char, const _GXColor*, const _GXColor*, const cXyz*) {
JPABaseEmitter* dPa_control_c::set(unsigned char, unsigned short, const cXyz*, const csXyz*, const cXyz*, unsigned char, dPa_levelEcallBack*, signed char, const _GXColor*, const _GXColor*, const cXyz*) {
/* Nonmatching */
}
@@ -456,80 +465,80 @@ void dPa_trackEcallBack::draw(JPABaseEmitter*) {
/* Nonmatching */
}
/* 8007F62C-8007F698 .text __dt__18dPa_trackEcallBackFv */
dPa_trackEcallBack::~dPa_trackEcallBack() {
/* Nonmatching */
}
// /* 8007F62C-8007F698 .text __dt__18dPa_trackEcallBackFv */
// dPa_trackEcallBack::~dPa_trackEcallBack() {
// /* Nonmatching */
// }
/* 8007F698-8007F704 .text __dt__22dPa_bombSmokeEcallBackFv */
dPa_bombSmokeEcallBack::~dPa_bombSmokeEcallBack() {
/* Nonmatching */
}
// /* 8007F698-8007F704 .text __dt__22dPa_bombSmokeEcallBackFv */
// dPa_bombSmokeEcallBack::~dPa_bombSmokeEcallBack() {
// /* Nonmatching */
// }
/* 8007F704-8007F708 .text setup__22dPa_bombSmokeEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
void dPa_bombSmokeEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
/* Nonmatching */
}
/* 8007F708-8007F764 .text __dt__19dPa_kageroEcallBackFv */
dPa_kageroEcallBack::~dPa_kageroEcallBack() {
/* Nonmatching */
}
// /* 8007F708-8007F764 .text __dt__19dPa_kageroEcallBackFv */
// dPa_kageroEcallBack::~dPa_kageroEcallBack() {
// /* Nonmatching */
// }
/* 8007F764-8007F7D0 .text __dt__20dPa_stripesEcallBackFv */
dPa_stripesEcallBack::~dPa_stripesEcallBack() {
/* Nonmatching */
}
// /* 8007F764-8007F7D0 .text __dt__20dPa_stripesEcallBackFv */
// dPa_stripesEcallBack::~dPa_stripesEcallBack() {
// /* Nonmatching */
// }
/* 8007F7D0-8007F7D4 .text setup__20dPa_stripesEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
void dPa_stripesEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
/* Nonmatching */
}
/* 8007F7D4-8007F840 .text __dt__22dPa_cutTurnEcallBack_cFv */
dPa_cutTurnEcallBack_c::~dPa_cutTurnEcallBack_c() {
/* Nonmatching */
}
// /* 8007F7D4-8007F840 .text __dt__22dPa_cutTurnEcallBack_cFv */
// dPa_cutTurnEcallBack_c::~dPa_cutTurnEcallBack_c() {
// /* Nonmatching */
// }
/* 8007F840-8007F8AC .text __dt__19dPa_splashEcallBackFv */
dPa_splashEcallBack::~dPa_splashEcallBack() {
/* Nonmatching */
}
// /* 8007F840-8007F8AC .text __dt__19dPa_splashEcallBackFv */
// dPa_splashEcallBack::~dPa_splashEcallBack() {
// /* Nonmatching */
// }
/* 8007F8AC-8007F940 .text __dt__17dPa_waveEcallBackFv */
dPa_waveEcallBack::~dPa_waveEcallBack() {
/* Nonmatching */
}
// /* 8007F8AC-8007F940 .text __dt__17dPa_waveEcallBackFv */
// dPa_waveEcallBack::~dPa_waveEcallBack() {
// /* Nonmatching */
// }
/* 8007F940-8007F99C .text __dt__19dPa_ripplePcallBackFv */
dPa_ripplePcallBack::~dPa_ripplePcallBack() {
/* Nonmatching */
}
// /* 8007F940-8007F99C .text __dt__19dPa_ripplePcallBackFv */
// dPa_ripplePcallBack::~dPa_ripplePcallBack() {
// /* Nonmatching */
// }
/* 8007F99C-8007F9A0 .text init__54JPACallBackBase2<P14JPABaseEmitter,P15JPABaseParticle>FP14JPABaseEmitterP15JPABaseParticle */
void JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::init(JPABaseEmitter*, JPABaseParticle*) {
/* Nonmatching */
}
/* 8007F9A0-8007FA0C .text __dt__25dPa_singleRippleEcallBackFv */
dPa_singleRippleEcallBack::~dPa_singleRippleEcallBack() {
/* Nonmatching */
}
// /* 8007F9A0-8007FA0C .text __dt__25dPa_singleRippleEcallBackFv */
// dPa_singleRippleEcallBack::~dPa_singleRippleEcallBack() {
// /* Nonmatching */
// }
/* 8007FA0C-8007FA78 .text __dt__19dPa_rippleEcallBackFv */
dPa_rippleEcallBack::~dPa_rippleEcallBack() {
/* Nonmatching */
}
// /* 8007FA0C-8007FA78 .text __dt__19dPa_rippleEcallBackFv */
// dPa_rippleEcallBack::~dPa_rippleEcallBack() {
// /* Nonmatching */
// }
/* 8007FA78-8007FA7C .text draw__54JPACallBackBase2<P14JPABaseEmitter,P15JPABaseParticle>FP14JPABaseEmitterP15JPABaseParticle */
void JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::draw(JPABaseEmitter*, JPABaseParticle*) {
/* Nonmatching */
}
/* 8007FA7C-8007FAE8 .text __dt__22dPa_selectTexEcallBackFv */
dPa_selectTexEcallBack::~dPa_selectTexEcallBack() {
/* Nonmatching */
}
// /* 8007FA7C-8007FAE8 .text __dt__22dPa_selectTexEcallBackFv */
// dPa_selectTexEcallBack::~dPa_selectTexEcallBack() {
// /* Nonmatching */
// }
/* 8007FAE8-8007FAEC .text setup__22dPa_selectTexEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
void dPa_selectTexEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
@@ -541,11 +550,6 @@ void JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::execute(JPABaseEmitter
/* Nonmatching */
}
/* 8007FAF0-8007FB0C .text cLib_calcTimer<Ul>__FPUl */
void cLib_calcTimer<unsigned long>(unsigned long*) {
/* Nonmatching */
}
/* 8007FF78-8007FFA8 .text draw__21dPa_setColorEcallBackFP14JPABaseEmitter */
void dPa_setColorEcallBack::draw(JPABaseEmitter*) {
/* Nonmatching */
@@ -556,8 +560,8 @@ void dPa_setColorEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, si
/* Nonmatching */
}
/* 8007FFAC-80080018 .text __dt__21dPa_setColorEcallBackFv */
dPa_setColorEcallBack::~dPa_setColorEcallBack() {
/* Nonmatching */
}
// /* 8007FFAC-80080018 .text __dt__21dPa_setColorEcallBackFv */
// dPa_setColorEcallBack::~dPa_setColorEcallBack() {
// /* Nonmatching */
// }