mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-17 04:52:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

it compiles. also split player and link headers.

Browse Source
This commit is contained in:
fig02
2023-09-12 23:43:04 -04:00
parent 85b77c336b
commit 60b9661107
8 changed files with 215 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1
View File
@@ -331,6 +331,7 @@ LIBS = [
Object(NonMatching, "d/d_save.cpp"),
Object(NonMatching, "d/d_save_init.cpp"),
Object(NonMatching, "d/actor/d_a_player_main.cpp"),
Object(NonMatching, "d/actor/d_a_itembase_static.cpp"),
Object(NonMatching, "d/actor/d_a_item_static.cpp"),
Object(NonMatching, "d/actor/d_a_item.cpp"),
include/d/actor/d_a_player.h → include/d/actor/daPy_lk.h
+66 -125
View File
@@ -1,125 +1,16 @@
#ifndef D_D_A_PLAYER_H
#define D_D_A_PLAYER_H
#ifndef D_A_PY_LK
#define D_A_PY_LK
#include "JAZelAudio/JAIZelBasic.h"
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "d/d_attention.h"
#include "d/d_bg_s_acch.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_cc_d.h"
#include "d/d_drawlist.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_com_inf_game.h"
#include "d/actor/daPy_py.h"
class mDoExt_MtxCalcOldFrame;
class daPy_matAnm_c;
class daPy_HIO_c;
class daPy_demo_c {
public:
void setDemoType(u16 pType) { mDemoType = pType; }
int getDemoType() const { return mDemoType; }
void setDemoMode(u32 mode) { mDemoMode = mode; }
u32 getDemoMode() const { return mDemoMode; }
int getParam1() const { return mParam1; }
void setOriginalDemoType() { setDemoType(3); }
void setSpecialDemoType() { setDemoType(5); }
void setSystemDemoType() { setDemoType(2); }
void setStick(f32 stick) { mStick = stick; }
void setMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
s16 getMoveAngle() const { return mDemoMoveAngle; }
f32 getStick() { return mStick; }
int getParam0() const { return mParam0; }
void setParam0(int value) { mParam0 = value; }
void setParam1(int value) { mParam1 = value; }
void setParam2(int value) { mParam2 = value; }
private:
/* 0x00 */ u16 mDemoType;
/* 0x02 */ s16 mDemoMoveAngle;
/* 0x04 */ s16 mTimer;
/* 0x06 */ s16 mParam2;
/* 0x08 */ int mParam0;
/* 0x0C */ int mParam1;
/* 0x10 */ u32 mDemoMode;
/* 0x14 */ f32 mStick;
}; // Size: 0x18
class daPy_py_c : public fopAc_ac_c {
public:
/* 0x290 */ u8 mAttackState;
/* 0x291 */ u8 field_0x291;
/* 0x292 */ u8 field_0x292[0x294 - 0x292];
/* 0x294 */ s16 field_0x294;
/* 0x296 */ s16 mQuakeTimer;
/* 0x298 */ int field_0x298;
/* 0x29C */ u32 field_0x29c;
/* 0x2A0 */ u32 field_0x2a0;
/* 0x2A4 */ u32 field_0x2a4;
/* 0x2A8 */ f32 field_0x2a8;
/* 0x2AC */ u8 field_0x2AC[0x2B0 - 0x2AC];
/* 0x2B0 */ f32 field_0x2b0;
/* 0x2B4 */ u8 field_0x2B4[0x2BC - 0x2B4];
/* 0x2BC */ cXyz mHeadTopPos;
/* 0x2C8 */ cXyz mSwordTopPos;
/* 0x2D4 */ cXyz field_0x2d4;
/* 0x2E0 */ cXyz field_0x2e0;
/* 0x2EC */ cXyz mRopePos;
/* 0x2F8 */ f32 field_0x2f8;
/* 0x2FC */ u8 field_0x2FC[0x300 - 0x2FC];
/* 0x300 */ f32 field_0x300;
/* 0x304 */ daPy_demo_c mDemo;
virtual void getLeftHandMatrix();
virtual void getRightHandMatrix();
virtual void getGroundY();
virtual void getTactMusic() const;
virtual void getTactTimerCancel() const;
virtual void checkPlayerGuard() const;
virtual void getGrabMissActor();
virtual void checkPlayerFly() const;
virtual void checkFrontRoll() const;
virtual void checkBottleSwing() const;
virtual void checkCutCharge() const;
virtual void getBokoFlamePos(cXyz*);
virtual void checkTactWait() const;
virtual void setTactZev(u32, int, char*);
virtual void onDekuSpReturnFlg(u8);
virtual void checkComboCutTurn() const;
virtual void getBaseAnimeFrameRate();
virtual void getBaseAnimeFrame();
virtual void getItemID() const;
virtual void getThrowBoomerangID() const;
virtual void getGrabActorID() const;
virtual void checkGrabBarrel();
virtual void checkPlayerNoDraw();
virtual void checkRopeTag();
virtual void checkRopeReadyAnime() const;
virtual void voiceStart(u32);
virtual void setOutPower(f32, s16, int);
virtual void onFrollCrashFlg(u32);
virtual void getModelJointMtx(u16);
virtual void getOldSpeedY();
virtual void setHookshotCarryOffset(u32, cXyz const*);
virtual void setPlayerPosAndAngle(cXyz*, s16);
virtual void setPlayerPosAndAngle(cXyz*, csXyz*);
virtual void setPlayerPosAndAngle(f32*[][][][]);
virtual void setThrowDamage(cXyz*, s16, f32, f32, int);
virtual void changeTextureAnime(u16, u16, int);
virtual void cancelChangeTextureAnime();
void getSwordTopPos() const;
void getLeftHandPos() const;
void getRopeJumpLand() const;
void checkRopeForceEnd() const;
void getHeadTopPos() const;
void changePlayer(fopAc_ac_c*);
void objWindHitCheck(dCcD_Cyl*);
void setDoButtonQuake();
void stopDoButtonQuake(int);
void getRopePos() const;
};
class daPy_anmHeap_c {
public:
@@ -174,11 +65,35 @@ private:
class daPy_footEffect_c {
public:
~daPy_footEffect_c();
daPy_footEffect_c();
/* 0x0 */ u8 field_0x0[0x4C];
};
class daPy_fanSwingEcallBack_c {
public:
void execute(JPABaseEmitter*);
~daPy_fanSwingEcallBack_c();
void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char);
};
class daPy_waterDropPcallBack_c {
public:
void execute(JPABaseEmitter*, JPABaseParticle*);
~daPy_waterDropPcallBack_c();
};
class daPy_swimTailEcallBack_c {
public:
void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char);
void getMaxWaterY(JGeometry::TVec3<float>*);
void remove();
void execute(JPABaseEmitter*);
void draw(JPABaseEmitter*);
~daPy_swimTailEcallBack_c();
daPy_swimTailEcallBack_c();
/* 0x0 */ u8 field_0x0[0x28];
};
@@ -199,26 +114,50 @@ public:
class daPy_waterDropEcallBack_c {
public:
void execute(JPABaseEmitter*);
void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char);
void end();
~daPy_waterDropEcallBack_c();
/* 0x0 */ u8 field_0x0[0x20];
};
class daPy_followEcallBack_c {
public:
void execute(JPABaseEmitter*);
void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char);
void end();
~daPy_followEcallBack_c();
/* 0x0 */ u8 field_0x0[0x1C];
};
class daPy_dmEcallBack_c {
public:
void execute(JPABaseEmitter*);
~daPy_dmEcallBack_c();
daPy_dmEcallBack_c();
/* 0x0 */ u8 field_0x0[0xC];
};
class daPy_mtxPosFollowEcallBack_c {
public:
void makeEmitterColor(unsigned short, float(*)[4], const cXyz*, const csXyz*, const _GXColor*, const _GXColor*);
void execute(JPABaseEmitter*);
daPy_mtxPosFollowEcallBack_c();
~daPy_mtxPosFollowEcallBack_c();
/* 0x0 */ u8 field_0x0[0x10];
};
class daPy_swBlur_c : public J3DPacket {
public:
void initSwBlur(float(*)[4], int, float, int);
void copySwBlur(float(*)[4], int);
void draw();
~daPy_swBlur_c();
/* 0x010 */ u8 field_0x010[0x014 - 0x010];
/* 0x014 */ int field_0x014;
/* 0x018 */ int field_0x018;
@@ -232,6 +171,8 @@ public:
class daPy_footData_c {
public:
~daPy_footData_c();
daPy_footData_c();
/* 0x0 */ u8 field_0x0[0x118];
};
@@ -249,7 +190,7 @@ public:
class daPy_lk_c : public daPy_py_c {
public:
enum HEAP_TYPE {};
enum daPy_HEAP_TYPE {};
enum daPy_ANM {};
@@ -395,7 +336,7 @@ public:
void checkSubjectEnd(int);
void checkGuardAccept();
void cancelNoDamageMode();
void commonProcInit();
void commonProcInit(daPy_lk_c::daPy_PROC procID);
void procScope_init(int);
void procScope();
void procSubjectivity_init(int);
@@ -532,7 +473,7 @@ public:
void initTextureAnime();
void initTextureScroll();
void createHeap();
void createAnimeHeap(JKRSolidHeap**, daPy_lk_c::HEAP_TYPE);
void createAnimeHeap(JKRSolidHeap**, daPy_HEAP_TYPE);
void initModel(J3DModel**, int, u32);
void entryBtk(J3DModelData*, int);
void entryBrk(J3DModelData*, int);
@@ -543,20 +484,20 @@ public:
void initSeAnime();
void resetSeAnime();
void setMoveAnime(f32, f32, f32, daPy_lk_c::daPy_ANM, daPy_lk_c::daPy_ANM, int, f32);
void setSingleMoveAnime();
void setSingleMoveAnime(daPy_lk_c::daPy_ANM, float, float, short, float);
void setActAnimeUpper(u16, daPy_lk_c::daPy_UPPER, f32, f32, s16, f32);
void resetActAnimeUpper();
void resetActAnimeUpper(daPy_lk_c::daPy_UPPER, float);
void animeUpdate();
void simpleAnmPlay(J3DAnmBase*);
void setHandModel();
void getAnmData();
void setHandModel(daPy_lk_c::daPy_ANM);
void getAnmData(daPy_lk_c::daPy_ANM) const;
void checkGrabWeapon(int);
void onDekuSpReturnFlg(u8);
void changeTextureAnime(u16, u16, int);
void setThrowDamage(cXyz*, s16, f32, f32, int);
void setPlayerPosAndAngle(cXyz*, s16);
void setPlayerPosAndAngle(cXyz*, csXyz*);
void setPlayerPosAndAngle(f32*[][][][]);
void setPlayerPosAndAngle(float(*)[4]);
void endDemoMode();
void getBokoFlamePos(cXyz*);
void setAuraEffect();
@@ -807,7 +748,7 @@ public:
void swimOutAfter(int);
void checkSwimFallCheck();
void changeSwimOutProc();
void setSwimMoveAnime();
void setSwimMoveAnime(daPy_lk_c::daPy_ANM);
void getSwimTimerRate();
void setSwimTimerStartStop();
void procSwimUp_init(int);
@@ -955,7 +896,7 @@ public:
void procBowMove_init();
void procBowMove();
void checkHookshotReturn();
void setHookshotCarryOffset(u32, cXyz const*);
void setHookshotCarryOffset(unsigned int, const cXyz*);
void setHookshotModel();
void setHookshotSight();
void freeHookshotItem();
@@ -988,7 +929,7 @@ public:
void checkEndTactMusic() const;
void getTactMetronomeRate();
void checkTactLastInput();
void setTactZev(u32, int, char*);
void setTactZev(unsigned int, int, char*);
void getTactTopPos(cXyz*);
void getTactNormalWait() const;
void getTactMusic() const;
@@ -1365,4 +1306,4 @@ public:
/* 0x4AF0 */ dCcD_Cps field_0x4af0;
};
#endif /* D_D_A_PLAYER_H */
#endif /* D_A_PY_LK */
include/d/actor/daPy_py.h
+131
View File
@@ -0,0 +1,131 @@
#ifndef D_A_PY_PY
#define D_A_PY_PY
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
class daPy_matAnm_c : public J3DMaterialAnm {
public:
daPy_matAnm_c() { init(); }
void init();
virtual ~daPy_matAnm_c();
virtual void calc(J3DMaterial*) const;
};
class daPy_HIO_c {
public:
};
class daPy_demo_c {
public:
void setDemoType(u16 pType) { mDemoType = pType; }
int getDemoType() const { return mDemoType; }
void setDemoMode(u32 mode) { mDemoMode = mode; }
u32 getDemoMode() const { return mDemoMode; }
int getParam1() const { return mParam1; }
void setOriginalDemoType() { setDemoType(3); }
void setSpecialDemoType() { setDemoType(5); }
void setSystemDemoType() { setDemoType(2); }
void setStick(f32 stick) { mStick = stick; }
void setMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
s16 getMoveAngle() const { return mDemoMoveAngle; }
f32 getStick() { return mStick; }
int getParam0() const { return mParam0; }
void setParam0(int value) { mParam0 = value; }
void setParam1(int value) { mParam1 = value; }
void setParam2(int value) { mParam2 = value; }
private:
/* 0x00 */ u16 mDemoType;
/* 0x02 */ s16 mDemoMoveAngle;
/* 0x04 */ s16 mTimer;
/* 0x06 */ s16 mParam2;
/* 0x08 */ int mParam0;
/* 0x0C */ int mParam1;
/* 0x10 */ u32 mDemoMode;
/* 0x14 */ f32 mStick;
}; // Size: 0x18
class daPy_py_c : public fopAc_ac_c {
public:
enum daPy_PROC {
/* 0x000 */ PROC_0,
};
/* 0x290 */ u8 mAttackState;
/* 0x291 */ u8 field_0x291;
/* 0x292 */ u8 field_0x292[0x294 - 0x292];
/* 0x294 */ s16 field_0x294;
/* 0x296 */ s16 mQuakeTimer;
/* 0x298 */ int field_0x298;
/* 0x29C */ u32 field_0x29c;
/* 0x2A0 */ u32 field_0x2a0;
/* 0x2A4 */ u32 field_0x2a4;
/* 0x2A8 */ f32 field_0x2a8;
/* 0x2AC */ u8 field_0x2AC[0x2B0 - 0x2AC];
/* 0x2B0 */ f32 field_0x2b0;
/* 0x2B4 */ u8 field_0x2B4[0x2BC - 0x2B4];
/* 0x2BC */ cXyz mHeadTopPos;
/* 0x2C8 */ cXyz mSwordTopPos;
/* 0x2D4 */ cXyz field_0x2d4;
/* 0x2E0 */ cXyz field_0x2e0;
/* 0x2EC */ cXyz mRopePos;
/* 0x2F8 */ f32 field_0x2f8;
/* 0x2FC */ u8 field_0x2FC[0x300 - 0x2FC];
/* 0x300 */ f32 field_0x300;
/* 0x304 */ daPy_demo_c mDemo;
virtual void getLeftHandMatrix();
virtual void getRightHandMatrix();
virtual void getGroundY();
virtual void getTactMusic() const;
virtual void getTactTimerCancel() const;
virtual void checkPlayerGuard() const;
virtual void getGrabMissActor();
virtual void checkPlayerFly() const;
virtual void checkFrontRoll() const;
virtual void checkBottleSwing() const;
virtual void checkCutCharge() const;
virtual void getBokoFlamePos(cXyz*);
virtual void checkTactWait() const;
virtual void setTactZev(unsigned int, int, char*);
virtual void onDekuSpReturnFlg(u8);
virtual void checkComboCutTurn() const;
virtual void getBaseAnimeFrameRate();
virtual void getBaseAnimeFrame();
virtual void getItemID() const;
virtual void getThrowBoomerangID() const;
virtual void getGrabActorID() const;
virtual void checkGrabBarrel();
virtual void checkPlayerNoDraw();
virtual void checkRopeTag();
virtual void checkRopeReadyAnime() const;
virtual void voiceStart(u32);
virtual void setOutPower(f32, s16, int);
virtual void onFrollCrashFlg(u32);
virtual void getModelJointMtx(u16);
virtual void getOldSpeedY();
virtual void setHookshotCarryOffset(unsigned int, const cXyz*);
virtual void setPlayerPosAndAngle(cXyz*, s16);
virtual void setPlayerPosAndAngle(cXyz*, csXyz*);
virtual void setPlayerPosAndAngle(float (*)[4]);
virtual void setThrowDamage(cXyz*, s16, f32, f32, int);
virtual void changeTextureAnime(u16, u16, int);
virtual void cancelChangeTextureAnime();
void getSwordTopPos() const;
void getLeftHandPos() const;
void getRopeJumpLand() const;
void checkRopeForceEnd() const;
void getHeadTopPos() const;
void changePlayer(fopAc_ac_c*);
void objWindHitCheck(dCcD_Cyl*);
void setDoButtonQuake();
void stopDoButtonQuake(int);
void getRopePos() const;
};
#endif /* D_A_PY_PY */
src/d/actor/d_a_item.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "d/d_item.h"
#include "d/d_item_data.h"
#include "d/actor/d_a_item.h"
#include "d/actor/d_a_player.h"
#include "d/actor/daPy_lk.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "dolphin/types.h"
src/d/actor/d_a_player.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
// Translation Unit: d_a_player.cpp
//
#include "d_a_player.h"
#include "daPy_lk.h"
#include "dolphin/types.h"
/* 801028FC-80102940 .text changePlayer__9daPy_py_cFP10fopAc_ac_c */
src/d/actor/d_a_player_main.cpp
+13 -240
View File
@@ -3,24 +3,15 @@
// Translation Unit: d_a_player_main.cpp
//
#include "d_a_player_main.h"
#include "dolphin/types.h"
#include "d/actor/daPy_lk.h"
#include "d/d_com_inf_game.h"
/* 80102E8C-80102EAC .text daPy_createHeap__FP10fopAc_ac_c */
void daPy_createHeap(fopAc_ac_c*) {
/* Nonmatching */
}
/* 80102EAC-80102F1C .text __ct__13daPy_matAnm_cFv */
daPy_matAnm_c::daPy_matAnm_c() {
/* Nonmatching */
}
/* 80102F1C-80102F64 .text __dt__14J3DMaterialAnmFv */
J3DMaterialAnm::~J3DMaterialAnm() {
/* Nonmatching */
}
/* 80102F64-80103074 .text calc__13daPy_matAnm_cCFP11J3DMaterial */
void daPy_matAnm_c::calc(J3DMaterial*) const {
/* Nonmatching */
@@ -76,6 +67,8 @@ void daPy_lk_c::auraJointCB0(int) {
/* Nonmatching */
}
class J3DNode;
/* 80103450-80103494 .text daPy_auraCallback__FP7J3DNodei */
void daPy_auraCallback(J3DNode*, int) {
/* Nonmatching */
@@ -752,7 +745,7 @@ void daPy_lk_c::cancelNoDamageMode() {
}
/* 80112348-80112954 .text commonProcInit__9daPy_lk_cFQ29daPy_lk_c9daPy_PROC */
void daPy_lk_c::commonProcInit(daPy_lk_c::daPy_PROC) {
void daPy_lk_c::commonProcInit(daPy_lk_c::daPy_PROC procID) {
/* Nonmatching */
}
@@ -1446,11 +1439,6 @@ void daPy_lk_c::initTextureScroll() {
/* Nonmatching */
}
/* 80123830-80123834 .text setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx */
void J3DTexGenBlock::setTexMtx(unsigned long, J3DTexMtx*) {
/* Nonmatching */
}
/* 80123834-8012469C .text createHeap__9daPy_lk_cFv */
void daPy_lk_c::createHeap() {
/* Nonmatching */
@@ -1461,11 +1449,6 @@ void daPy_lk_c::createAnimeHeap(JKRSolidHeap**, daPy_lk_c::daPy_HEAP_TYPE) {
/* Nonmatching */
}
/* 801249F8-80124A40 .text __dt__10JUTNameTabFv */
JUTNameTab::~JUTNameTab() {
/* Nonmatching */
}
/* 80124A40-80124B30 .text initModel__9daPy_lk_cFPP8J3DModeliUl */
void daPy_lk_c::initModel(J3DModel**, int, unsigned long) {
/* Nonmatching */
@@ -1522,8 +1505,14 @@ void phase_3(daPy_lk_c*) {
}
/* 80127B70-80127BA0 .text daPy_Create__FP10fopAc_ac_c */
void daPy_Create(fopAc_ac_c*) {
/* Nonmatching */
void daPy_Create(fopAc_ac_c* i_this) {
// static int (*l_method[3])(void*) = {
// (int (*)(void*))phase_1,
// (int (*)(void*))phase_2,
// (int (*)(void*))phase_3,
// };
// dComLbG_PhaseHandler(&(<static_cast>(i_this)->mPhsLoad), l_method, i_this);
}
/* 80127BA0-80127CC0 .text setSeAnime__9daPy_lk_cFPC14daPy_anmHeap_cP12J3DFrameCtrl */
@@ -3536,36 +3525,6 @@ daPy_sightPacket_c::~daPy_sightPacket_c() {
/* Nonmatching */
}
/* 80147094-801470D4 .text __ct__12J3DFrameCtrlFv */
J3DFrameCtrl::J3DFrameCtrl() {
/* Nonmatching */
}
/* 801470D4-80147110 .text __dt__19mDoExt_AnmRatioPackFv */
mDoExt_AnmRatioPack::~mDoExt_AnmRatioPack() {
/* Nonmatching */
}
/* 80147110-80147124 .text __ct__19mDoExt_AnmRatioPackFv */
mDoExt_AnmRatioPack::mDoExt_AnmRatioPack() {
/* Nonmatching */
}
/* 80147124-80147278 .text __dt__19dBgS_MirLightLinChkFv */
dBgS_MirLightLinChk::~dBgS_MirLightLinChk() {
/* Nonmatching */
}
/* 80147278-8014739C .text __dt__16dBgS_LinkRoofChkFv */
dBgS_LinkRoofChk::~dBgS_LinkRoofChk() {
/* Nonmatching */
}
/* 8014739C-801474DC .text __dt__15dBgS_LinkGndChkFv */
dBgS_LinkGndChk::~dBgS_LinkGndChk() {
/* Nonmatching */
}
/* 801474DC-801474E4 .text getGroundY__9daPy_lk_cFv */
void daPy_lk_c::getGroundY() {
/* Nonmatching */
@@ -3671,51 +3630,6 @@ void daPy_fanSwingEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*,
/* Nonmatching */
}
/* 80149524-8014952C .text @20@__dt__15dBgS_LinkGndChkFv */
void @20@__dt__15dBgS_LinkGndChkFv {
/* Nonmatching */
}
/* 8014952C-80149534 .text @76@__dt__15dBgS_LinkGndChkFv */
void @76@__dt__15dBgS_LinkGndChkFv {
/* Nonmatching */
}
/* 80149534-8014953C .text @64@__dt__15dBgS_LinkGndChkFv */
void @64@__dt__15dBgS_LinkGndChkFv {
/* Nonmatching */
}
/* 8014953C-80149544 .text @16@__dt__16dBgS_LinkRoofChkFv */
void @16@__dt__16dBgS_LinkRoofChkFv {
/* Nonmatching */
}
/* 80149544-8014954C .text @48@__dt__16dBgS_LinkRoofChkFv */
void @48@__dt__16dBgS_LinkRoofChkFv {
/* Nonmatching */
}
/* 8014954C-80149554 .text @36@__dt__16dBgS_LinkRoofChkFv */
void @36@__dt__16dBgS_LinkRoofChkFv {
/* Nonmatching */
}
/* 80149554-8014955C .text @20@__dt__19dBgS_MirLightLinChkFv */
void @20@__dt__19dBgS_MirLightLinChkFv {
/* Nonmatching */
}
/* 8014955C-80149564 .text @100@__dt__19dBgS_MirLightLinChkFv */
void @100@__dt__19dBgS_MirLightLinChkFv {
/* Nonmatching */
}
/* 80149564-8014956C .text @88@__dt__19dBgS_MirLightLinChkFv */
void @88@__dt__19dBgS_MirLightLinChkFv {
/* Nonmatching */
}
/* 8014956C-80149590 .text checkBoomerangAnime__9daPy_lk_cCFv */
void daPy_lk_c::checkBoomerangAnime() const {
/* Nonmatching */
@@ -3931,11 +3845,6 @@ void daPy_lk_c::procHookshotFly() {
/* Nonmatching */
}
/* 8014BA84-8014BAA0 .text getMoveVec__12daHookshot_cCFv */
void daHookshot_c::getMoveVec() const {
/* Nonmatching */
}
/* 8014BAA0-8014BAEC .text fanWindEffectDraw__9daPy_lk_cFv */
void daPy_lk_c::fanWindEffectDraw() {
/* Nonmatching */
@@ -4660,139 +4569,3 @@ void daPy_lk_c::procCutKesa_init() {
void daPy_lk_c::procCutKesa() {
/* Nonmatching */
}
/* 8015A1DC-8015A1E0 .text __ct__10daPy_HIO_cFv */
daPy_HIO_c::daPy_HIO_c() {
/* Nonmatching */
}
/* 8015A1E0-8015A1E8 .text getTactMusic__9daPy_py_cCFv */
void daPy_py_c::getTactMusic() const {
/* Nonmatching */
}
/* 8015A1E8-8015A1F0 .text getTactTimerCancel__9daPy_py_cCFv */
void daPy_py_c::getTactTimerCancel() const {
/* Nonmatching */
}
/* 8015A1F0-8015A1F8 .text getGrabMissActor__9daPy_py_cFv */
void daPy_py_c::getGrabMissActor() {
/* Nonmatching */
}
/* 8015A1F8-8015A200 .text checkFrontRoll__9daPy_py_cCFv */
void daPy_py_c::checkFrontRoll() const {
/* Nonmatching */
}
/* 8015A200-8015A208 .text checkBottleSwing__9daPy_py_cCFv */
void daPy_py_c::checkBottleSwing() const {
/* Nonmatching */
}
/* 8015A208-8015A210 .text checkCutCharge__9daPy_py_cCFv */
void daPy_py_c::checkCutCharge() const {
/* Nonmatching */
}
/* 8015A210-8015A218 .text checkTactWait__9daPy_py_cCFv */
void daPy_py_c::checkTactWait() const {
/* Nonmatching */
}
/* 8015A218-8015A21C .text setTactZev__9daPy_py_cFUiiPc */
void daPy_py_c::setTactZev(unsigned int, int, char*) {
/* Nonmatching */
}
/* 8015A21C-8015A220 .text onDekuSpReturnFlg__9daPy_py_cFUc */
void daPy_py_c::onDekuSpReturnFlg(unsigned char) {
/* Nonmatching */
}
/* 8015A220-8015A228 .text checkComboCutTurn__9daPy_py_cCFv */
void daPy_py_c::checkComboCutTurn() const {
/* Nonmatching */
}
/* 8015A228-8015A230 .text getItemID__9daPy_py_cCFv */
void daPy_py_c::getItemID() const {
/* Nonmatching */
}
/* 8015A230-8015A238 .text getThrowBoomerangID__9daPy_py_cCFv */
void daPy_py_c::getThrowBoomerangID() const {
/* Nonmatching */
}
/* 8015A238-8015A240 .text checkGrabBarrel__9daPy_py_cFv */
void daPy_py_c::checkGrabBarrel() {
/* Nonmatching */
}
/* 8015A240-8015A248 .text checkRopeTag__9daPy_py_cFv */
void daPy_py_c::checkRopeTag() {
/* Nonmatching */
}
/* 8015A248-8015A24C .text voiceStart__9daPy_py_cFUl */
void daPy_py_c::voiceStart(unsigned long) {
/* Nonmatching */
}
/* 8015A24C-8015A250 .text setOutPower__9daPy_py_cFfsi */
void daPy_py_c::setOutPower(float, short, int) {
/* Nonmatching */
}
/* 8015A250-8015A258 .text getModelJointMtx__9daPy_py_cFUs */
void daPy_py_c::getModelJointMtx(unsigned short) {
/* Nonmatching */
}
/* 8015A258-8015A260 .text getOldSpeedY__9daPy_py_cFv */
void daPy_py_c::getOldSpeedY() {
/* Nonmatching */
}
/* 8015A260-8015A268 .text setHookshotCarryOffset__9daPy_py_cFUiPC4cXyz */
void daPy_py_c::setHookshotCarryOffset(unsigned int, const cXyz*) {
/* Nonmatching */
}
/* 8015A268-8015A26C .text setPlayerPosAndAngle__9daPy_py_cFPA4_f */
void daPy_py_c::setPlayerPosAndAngle(float(*)[4]) {
/* Nonmatching */
}
/* 8015A26C-8015A270 .text setPlayerPosAndAngle__9daPy_py_cFP4cXyzP5csXyz */
void daPy_py_c::setPlayerPosAndAngle(cXyz*, csXyz*) {
/* Nonmatching */
}
/* 8015A270-8015A278 .text setThrowDamage__9daPy_py_cFP4cXyzsffi */
void daPy_py_c::setThrowDamage(cXyz*, short, float, float, int) {
/* Nonmatching */
}
/* 8015A278-8015A27C .text changeTextureAnime__9daPy_py_cFUsUsi */
void daPy_py_c::changeTextureAnime(unsigned short, unsigned short, int) {
/* Nonmatching */
}
/* 8015A27C-8015A280 .text cancelChangeTextureAnime__9daPy_py_cFv */
void daPy_py_c::cancelChangeTextureAnime() {
/* Nonmatching */
}
/* 8015A280-8015A308 .text __dt__19J3DAnmTextureSRTKeyFv */
J3DAnmTextureSRTKey::~J3DAnmTextureSRTKey() {
/* Nonmatching */
}
/* 8015A308-8015A37C .text __dt__16J3DAnmTexPatternFv */
J3DAnmTexPattern::~J3DAnmTexPattern() {
/* Nonmatching */
}
src/d/actor/d_a_tag_ret.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "d/d_cc_d.h"
#include "d/d_procname.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "d/actor/daPy_lk.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "dolphin/types.h"
src/d/d_com_inf_game.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "JSystem/JUtility/JUTAssert.h"
#include "MSL_C/string.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/actor/d_a_player.h"
#include "d/actor/daPy_lk.h"
#include "d/d_com_lib_game.h"
#include "d/d_demo.h"
#include "d/d_flower.h"