mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove "duplicated" inlines (#2099)

Browse Source 
* fix f_op_actor_mng inlines

* fix f_pc inlines

* fix d_a_alink weak func signatures

* fix d_com_inf_game inlines

* fix some more inlines

* fix rest of player inlines

* m_Do / JSystem inlines fixed

* fix upstream changes
This commit is contained in:
TakaRikka
2024-03-19 04:31:53 -07:00
committed by GitHub
parent 38e0f8927a
commit 25d51079a3
347 changed files with 3968 additions and 3888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/a/d_a_alink/checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2.s
+4
View File
@@ -0,0 +1,4 @@
lbl_80141190:
/* 80141190 80 03 05 90 */ lwz r0, 0x590(r3)
/* 80141194 7C 03 20 38 */ and r3, r0, r4
/* 80141198 4E 80 00 20 */ blr
asm/d/a/d_a_alink/checkForceNormalColor__9daMidna_cCFv.s
+4
View File
@@ -0,0 +1,4 @@
lbl_80141A04:
/* 80141A04 80 03 08 94 */ lwz r0, 0x894(r3)
/* 80141A08 54 03 07 38 */ rlwinm r3, r0, 0, 0x1c, 0x1c
/* 80141A0C 4E 80 00 20 */ blr
asm/d/a/d_a_alink/checkForceTiredColor__9daMidna_cCFv.s
+4
View File
@@ -0,0 +1,4 @@
lbl_80141A10:
/* 80141A10 80 03 08 94 */ lwz r0, 0x894(r3)
/* 80141A14 54 03 07 7A */ rlwinm r3, r0, 0, 0x1d, 0x1d
/* 80141A18 4E 80 00 20 */ blr
asm/d/a/d_a_alink/checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3.s
+4
View File
@@ -0,0 +1,4 @@
lbl_801411D4:
/* 801411D4 80 03 05 7C */ lwz r0, 0x57c(r3)
/* 801411D8 7C 03 20 38 */ and r3, r0, r4
/* 801411DC 4E 80 00 20 */ blr
asm/d/a/d_a_alink/dMeter2Info_offUseButton__Fi.s
+8
View File
@@ -0,0 +1,8 @@
lbl_8014196C:
/* 8014196C 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */
/* 80141970 38 A4 01 88 */ addi r5, r4, g_meter2_info@l /* 0x80430188@l */
/* 80141974 A0 85 00 AE */ lhz r4, 0xae(r5)
/* 80141978 54 60 04 3E */ clrlwi r0, r3, 0x10
/* 8014197C 7C 80 00 78 */ andc r0, r4, r0
/* 80141980 B0 05 00 AE */ sth r0, 0xae(r5)
/* 80141984 4E 80 00 20 */ blr
asm/d/a/d_a_alink/dMeter2Info_setFloatingMessage__FUssb.s
+16
View File
@@ -0,0 +1,16 @@
lbl_801419B8:
/* 801419B8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801419BC 7C 08 02 A6 */ mflr r0
/* 801419C0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801419C4 7C 67 1B 78 */ mr r7, r3
/* 801419C8 7C 80 23 78 */ mr r0, r4
/* 801419CC 7C A6 2B 78 */ mr r6, r5
/* 801419D0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801419D4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801419D8 7C E4 3B 78 */ mr r4, r7
/* 801419DC 7C 05 03 78 */ mr r5, r0
/* 801419E0 48 0D A7 01 */ bl setFloatingMessage__13dMeter2Info_cFUssb
/* 801419E4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801419E8 7C 08 03 A6 */ mtlr r0
/* 801419EC 38 21 00 10 */ addi r1, r1, 0x10
/* 801419F0 4E 80 00 20 */ blr
asm/d/a/d_a_alink/func_80141AE8.s
+9
View File
@@ -0,0 +1,9 @@
lbl_80141AE8:
/* 80141AE8 88 83 00 00 */ lbz r4, 0(r3)
/* 80141AEC 28 04 00 00 */ cmplwi r4, 0
/* 80141AF0 41 82 00 0C */ beq lbl_80141AFC
/* 80141AF4 38 04 FF FF */ addi r0, r4, -1
/* 80141AF8 98 03 00 00 */ stb r0, 0(r3)
lbl_80141AFC:
/* 80141AFC 88 63 00 00 */ lbz r3, 0(r3)
/* 80141B00 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daPy_py_cCFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_80141874:
/* 80141874 A8 63 04 E6 */ lha r3, 0x4e6(r3)
/* 80141878 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getInvMtx__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_80141514:
/* 80141514 80 63 05 04 */ lwz r3, 0x504(r3)
/* 80141518 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getLeftHandMatrix__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_80141534:
/* 80141534 80 63 05 04 */ lwz r3, 0x504(r3)
/* 80141538 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getLeftItemMatrix__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_80141524:
/* 80141524 80 63 05 04 */ lwz r3, 0x504(r3)
/* 80141528 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_80141544:
/* 80141544 80 63 05 04 */ lwz r3, 0x504(r3)
/* 80141548 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getModelMtx__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_8014150C:
/* 8014150C 80 63 05 04 */ lwz r3, 0x504(r3)
/* 80141510 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getRightHandMatrix__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_8014153C:
/* 8014153C 80 63 05 04 */ lwz r3, 0x504(r3)
/* 80141540 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getRightItemMatrix__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_8014152C:
/* 8014152C 80 63 05 04 */ lwz r3, 0x504(r3)
/* 80141530 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getShadowTalkAtnPos__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_8014151C:
/* 8014151C 38 63 04 D0 */ addi r3, r3, 0x4d0
/* 80141520 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getSumouMode__9daPy_py_cCFv.s
+11
View File
@@ -0,0 +1,11 @@
lbl_801411B0:
/* 801411B0 38 00 00 00 */ li r0, 0
/* 801411B4 88 63 05 6A */ lbz r3, 0x56a(r3)
/* 801411B8 28 03 00 00 */ cmplwi r3, 0
/* 801411BC 41 82 00 10 */ beq lbl_801411CC
/* 801411C0 28 03 00 26 */ cmplwi r3, 0x26
/* 801411C4 40 80 00 08 */ bge lbl_801411CC
/* 801411C8 38 00 00 01 */ li r0, 1
lbl_801411CC:
/* 801411CC 7C 03 03 78 */ mr r3, r0
/* 801411D0 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_80141554:
/* 80141554 80 63 05 04 */ lwz r3, 0x504(r3)
/* 80141558 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getWolfMouthMatrix__9daPy_py_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_8014154C:
/* 8014154C 80 63 05 04 */ lwz r3, 0x504(r3)
/* 80141550 4E 80 00 20 */ blr
asm/d/a/d_a_alink/getZeldaActor__9daHorse_cFv.s
+3
View File
@@ -0,0 +1,3 @@
lbl_80141944:
/* 80141944 80 63 12 58 */ lwz r3, 0x1258(r3)
/* 80141948 4E 80 00 20 */ blr
asm/d/a/d_a_alink/onForcePanic__9daMidna_cFv.s
+5
View File
@@ -0,0 +1,5 @@
lbl_801419F4:
/* 801419F4 80 03 08 98 */ lwz r0, 0x898(r3)
/* 801419F8 60 00 00 08 */ ori r0, r0, 8
/* 801419FC 90 03 08 98 */ stw r0, 0x898(r3)
/* 80141A00 4E 80 00 20 */ blr
asm/d/a/d_a_alink/onNoServiceWait__9daMidna_cFv.s
+5
View File
@@ -0,0 +1,5 @@
lbl_80141A84:
/* 80141A84 80 03 08 98 */ lwz r0, 0x898(r3)
/* 80141A88 60 00 00 80 */ ori r0, r0, 0x80
/* 80141A8C 90 03 08 98 */ stw r0, 0x898(r3)
/* 80141A90 4E 80 00 20 */ blr
include/JSystem/J3DGraphAnimator/J3DModel.h
+3 -8
View File
@@ -39,7 +39,6 @@ public:
entryModelData(param_0, param_1, param_2);
}
/* 800CFFF4 */ void setBaseTRMtx(f32 (*)[4]);
/* 80327100 */ void initialize();
/* 80327184 */ s32 entryModelData(J3DModelData*, u32, u32);
/* 80327300 */ s32 createShapePacket(J3DModelData*);
@@ -56,7 +55,6 @@ public:
/* 803281B4 */ void calcBumpMtx();
/* 803282B8 */ void calcBBoardMtx();
/* 803282EC */ void prepareShapePackets();
MtxP getAnmMtx(int);
/* 80327CA4 */ virtual void update();
/* 80327E4C */ virtual void entry();
@@ -75,7 +73,7 @@ public:
bool isCpuSkinningOn() const { return (mFlags & J3DMdlFlag_SkinPosCpu) && (mFlags & J3DMdlFlag_SkinNrmCpu); }
Mtx& getBaseTRMtx() { return mBaseTransformMtx; }
void i_setBaseTRMtx(Mtx m) { MTXCopy(m, mBaseTransformMtx); }
void setBaseTRMtx(Mtx m) { MTXCopy(m, mBaseTransformMtx); }
u32 getMtxCalcMode() const { return mFlags & 0x03; }
J3DVertexBuffer* getVertexBuffer() const { return (J3DVertexBuffer*)&mVertexBuffer; }
J3DMatPacket* getMatPacket(u16 idx) const { return &mMatPacket[idx]; }
@@ -89,11 +87,8 @@ public:
void setUserArea(u32 area) { mUserArea = area; }
u32 getUserArea() const { return mUserArea; }
Vec* getBaseScale() { return &mBaseScale; }
void setAnmMtx(int i, Mtx m) { mMtxBuffer->setAnmMtx(i, m); }
// is there a better way to handle inlines with same name as non-inlines?
MtxP i_getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); }
void i_setAnmMtx(int p1, Mtx mtx) { mMtxBuffer->setAnmMtx(p1, mtx); }
void setAnmMtx(int jointNo, Mtx m) { mMtxBuffer->setAnmMtx(jointNo, m); }
MtxP getAnmMtx(int jointNo) { return mMtxBuffer->getAnmMtx(jointNo); }
/* 0x04 */ J3DModelData* mModelData;
/* 0x08 */ u32 mFlags;
include/JSystem/JKernel/JKRHeap.h
+1 -1
View File
@@ -211,7 +211,7 @@ inline void JKRFreeToSysHeap(void* ptr) {
systemHeap->free(ptr);
}
inline void i_JKRFree(void* ptr) {
inline void JKRFree(void* ptr) {
JKRHeap::free(ptr, NULL);
}
include/d/a/d_a_alink.h
+13 -23
View File
@@ -156,7 +156,6 @@ public:
static u8 m_morf_frame;
private:
/* 0x0F4 */ f32 field_0xf4;
/* 0x0F8 */ f32 field_0xf8;
/* 0x0FC */ f32 mNowOffsetX;
@@ -1669,16 +1668,9 @@ public:
/* 800CF100 */ int procCoPeepSubjectivityInit();
/* 800CF1B8 */ int procCoPeepSubjectivity();
/* 800CF380 */ daAlink_c();
/* 800CFEB0 */ BOOL checkRideOn() const;
/* 800CFF4C */ BOOL checkAttentionLock();
/* 800D0020 */ BOOL checkFmChainGrabAnime() const;
/* 800D0048 */ BOOL checkSmallUpperGuardAnime() const;
/* 800D00EC */ u32 checkReinRide() const;
/* 800D0110 */ BOOL checkWolfEnemyThrowAnime() const;
/* 800D0138 */ int checkSpecialDemoMode() const;
/* 800D014C */ void setMidnaTalkStatus(u8);
/* 800D0164 */ void set3DStatus(u8, u8);
/* 800D018C */ u32 checkModeFlg(u32) const;
/* 800D2684 */ void checkCutTurnCharge();
/* 800D0E08 */ void checkLightSwordMtrl();
/* 800D0E98 */ BOOL checkSwordEquipAnime() const;
@@ -3136,15 +3128,14 @@ public:
virtual bool checkCopyRodEquip() const;
virtual BOOL checkCutJumpMode() const;
// inlined dupes
u32 i_checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
bool i_checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
bool i_checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
bool checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
bool checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
Z2WolfHowlMgr* i_getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
// this might be a fake match, but helps fix usage in many functions
#pragma optimization_level 2
BOOL i_checkAttentionLock() { return mAttention->Lockon(); }
BOOL checkAttentionLock() { return mAttention->Lockon(); }
#pragma optimization_level 3
bool checkUpperAnime(u16 i_idx) const { return mUpperAnmHeap[UPPER_2].getIdx() == i_idx; }
@@ -3241,15 +3232,15 @@ public:
}
s32 checkPlayerDemoMode() const { return mDemo.getDemoType(); }
BOOL i_checkSpecialDemoMode() const { return mDemo.getDemoType() == 5; }
static bool checkMidnaChargeAttack() { return i_dComIfGs_isEventBit(0x501); }
BOOL checkSpecialDemoMode() const { return mDemo.getDemoType() == 5; }
static bool checkMidnaChargeAttack() { return dComIfGs_isEventBit(0x501); }
u16 getMidnaMsgNum() const { return mMidnaMsgNum; }
u32 getStartEvent() { return fopAcM_GetParam(this) >> 0x18; }
const daAlink_AnmData* getAnmData(daAlink_ANM anmID) const { return &m_anmDataTable[anmID]; }
const daAlink_FaceTexData* getFaceTexData(daAlink_FTANM i_anmID) const { return &m_faceTexDataTable[i_anmID]; }
BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
BOOL checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
int getGrassHowlEventActor() const { return field_0x3198; }
MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); }
@@ -3273,7 +3264,7 @@ public:
if (!var_r3) {
bool var_r3_2 = 0;
if (mProcID != PROC_FISHING_CAST && i_checkNoResetFlg2(FLG2_UNK_20000000)) {
if (mProcID != PROC_FISHING_CAST && checkNoResetFlg2(FLG2_UNK_20000000)) {
var_r3_2 = 1;
}
@@ -3287,7 +3278,7 @@ public:
MtxP getCopyRodMtx() {
if (mHeldItemModel != NULL) {
return mHeldItemModel->i_getAnmMtx(0);
return mHeldItemModel->getAnmMtx(0);
}
return NULL;
}
@@ -3298,7 +3289,7 @@ public:
void clearIronBallActor() { field_0x173c.SetActor(this); }
BOOL checkCanoeRideOwn(const fopAc_ac_c* param_0) const { return checkCanoeRide() && mRideAcKeep.getActorConst() == param_0; }
bool checkWolfDashMode() const { return i_checkNoResetFlg1(FLG1_DASH_MODE); }
bool checkWolfDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); }
bool checkWolfLieWaterIn() const { return mWaterY > current.pos.y + 20.5f; }
J3DModel* initModel(J3DModelData* p_modelData, u32 param_1) {
@@ -3317,9 +3308,9 @@ public:
bool checkHorseGetOffMode() const { return mProcID == PROC_HORSE_GETOFF; }
bool checkHorseRideOn() const { return mProcID == PROC_HORSE_RIDE; }
BOOL i_checkRideOn() const { return mRideStatus != 0; }
BOOL checkRideOn() const { return mRideStatus != 0; }
bool checkSwimDashMode() const { return i_checkNoResetFlg1(FLG1_DASH_MODE); }
bool checkSwimDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); }
bool talkTrigger() const { return mItemTrigger & BTN_A; }
J3DAnmTransform* getNowAnmPackUnder(daAlink_UNDER i_idx) {
@@ -3399,7 +3390,6 @@ public:
static u8 m_fEffParamProc[72];
private:
/* 0x0062C */ request_of_phase_process_class mPhaseReq;
/* 0x00634 */ char* mArcName;
/* 0x00638 */ JKRExpHeap* field_0x0638;
@@ -6250,7 +6240,7 @@ public:
};
inline BOOL dComIfGs_isTransformLV(int i_no);
inline BOOL i_dComIfGs_isEventBit(const u16);
inline BOOL dComIfGs_isEventBit(const u16);
static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1);
static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1);
include/d/a/d_a_player.h
+79 -102
View File
@@ -143,8 +143,6 @@ public:
DEMO_NEW_ANM0_e = 0x200,
};
void setSpecialDemoType();
void setDemoType(u16 pType) { mDemoType = pType; }
int getDemoType() const { return mDemoType; }
void setDemoMode(u32 mode) { mDemoMode = mode; }
@@ -152,7 +150,7 @@ public:
int getParam1() const { return mParam1; }
s16 getParam2() const { return mParam2; }
void setOriginalDemoType() { setDemoType(3); }
void i_setSpecialDemoType() { setDemoType(5); }
void setSpecialDemoType() { setDemoType(5); }
void setSystemDemoType() { setDemoType(2); }
void setStick(f32 stick) { mStick = stick; }
void setMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
@@ -186,7 +184,7 @@ class daMidna_c;
class daSpinner_c;
class daPy_py_c;
inline daPy_py_c* dComIfGp_getLinkPlayer();
inline BOOL i_dComIfGs_isEventBit(const u16);
inline BOOL dComIfGs_isEventBit(const u16);
class daPy_py_c : public fopAc_ac_c {
public:
@@ -231,6 +229,7 @@ public:
FLG0_UNK_80000 = 0x80000,
FLG0_UNK_40000 = 0x40000,
FLG0_UNK_20000 = 0x20000,
FLG0_UNK_10000 = 0x10000,
FLG0_UNK_8000 = 0x8000,
FLG0_UNK_4000 = 0x4000,
FLG0_UNK_2000 = 0x2000,
@@ -260,6 +259,7 @@ public:
FLG1_IS_WOLF = 0x2000000,
FLG1_UNK_800000 = 0x800000,
FLG1_DASH_MODE = 0x400000,
FLG1_UNK_100000 = 0x100000,
FLG1_UNK_10000 = 0x10000,
FLG1_UNK_8000 = 0x8000,
FLG1_THROW_DAMAGE = 0x4000,
@@ -276,6 +276,7 @@ public:
FLG1_UNK_1 = 1,
FLG1_UNK_1800 = 0x1800,
FLG1_UNK_10100000 = FLG1_UNK_10000000 | FLG1_UNK_100000,
};
enum daPy_FLG2 {
@@ -310,6 +311,7 @@ public:
FLG2_UNK_1 = 1,
FLG2_UNK_58 = FLG2_UNK_40 | FLG2_UNK_10 | FLG2_UNK_8,
FLG2_UNK_10000001 = FLG2_UNK_10000000 | FLG2_UNK_1,
};
enum daPy_FLG3 {
@@ -391,6 +393,7 @@ public:
ERFLG2_UNK_100 = 0x100,
ERFLG2_UNK_40 = 0x40,
ERFLG2_UNK_20 = 0x20,
ERFLG2_UNK_10 = 0x10,
ERFLG2_UNK_2 = 2,
};
@@ -420,6 +423,7 @@ public:
enum daPy_RFLG1 {
RFLG1_UNK_100 = 0x100,
RFLG1_UNK_40 = 0x40,
RFLG1_UNK_30 = 0x30,
RFLG1_UNK_2 = 0x2,
RFLG1_WOLF_ATTACK_REVERSE = 0x1,
@@ -518,41 +522,19 @@ public:
static void setPlayerDamage(int, int);
static void setMidnaMotionNum(int);
static void setMidnaFaceNum(int);
u32 checkNoResetFlg0(daPy_FLG0) const;
u32 checkEquipHeavyBoots() const;
u32 checkBoarSingleBattle() const;
u32 checkEndResetFlg0(daPy_ERFLG0) const;
void onNoResetFlg2(daPy_py_c::daPy_FLG2);
void offNoResetFlg0(daPy_py_c::daPy_FLG0);
int checkEndResetFlg2(daPy_py_c::daPy_ERFLG2) const;
bool getSumouMode() const;
int checkNoResetFlg3(daPy_py_c::daPy_FLG3) const;
BOOL checkShieldGet();
void onNoResetFlg0(daPy_py_c::daPy_FLG0);
u32 checkEndResetFlg1(daPy_py_c::daPy_ERFLG1) const;
void offNoResetFlg1(daPy_py_c::daPy_FLG1);
void offNoResetFlg2(daPy_py_c::daPy_FLG2);
u32 checkWolf() const;
BOOL checkSwordGet();
u32 checkResetFlg0(daPy_py_c::daPy_RFLG0) const;
u32 checkNoResetFlg2(daPy_py_c::daPy_FLG2) const;
u32 checkMagneBootsOn() const;
void changeDemoPos0(cXyz const*);
void changeDemoMode(u32, int, int, s16);
void changeDemoParam2(s16);
void cancelOriginalDemo();
void changeOriginalDemo();
cXyz getHeadTopPos() const;
/* 801829E0 */ BOOL checkThrowDamage() const { return i_checkNoResetFlg1(FLG1_THROW_DAMAGE); }
/* 80182A10 */ BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; }
/* 80182AAC */ cXyz* getRightFootPosP() { return &mRightFootPos; }
/* 80182AB4 */ cXyz* getLeftFootPosP() { return &mLeftFootPos; }
/* 80182AC4 */ BOOL checkCopyRodThrowAfter() const { return i_checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); }
/* 80182AD8 */ BOOL checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
/* 80182B9C */ const cXyz& getRightHandPos() const { return mRightHandPos; }
/* 8015DFD8 */ const cXyz* getItemPos() const { return &mItemPos; }
/* 8015DFF4 */ const cXyz* getLeftHandPos() const { return &mLeftHandPos; }
/* 800977B4 */ bool checkMidnaRide() const;
BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; }
cXyz* getRightFootPosP() { return &mRightFootPos; }
cXyz* getLeftFootPosP() { return &mLeftFootPos; }
BOOL checkCopyRodThrowAfter() const { return checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); }
BOOL checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
const cXyz& getRightHandPos() const { return mRightHandPos; }
const cXyz* getItemPos() const { return &mItemPos; }
const cXyz* getLeftHandPos() const { return &mLeftHandPos; }
virtual cXyz* getMidnaAtnPos() const;
virtual void setMidnaMsgNum(fopAc_ac_c*, u16);
@@ -734,39 +716,38 @@ public:
return sumouCameraMode;
}
bool i_getSumouMode() const { return getSumouCameraMode(); }
void i_cancelOriginalDemo() {
bool getSumouMode() const { return getSumouCameraMode(); }
void cancelOriginalDemo() {
mDemo.setSystemDemoType();
mDemo.setDemoMode(1);
}
bool checkStatusWindowDraw() { return i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); }
bool checkStatusWindowDraw() { return checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); }
bool checkCargoCarry() const { return mSpecialMode == SMODE_CARGO_CARRY; }
bool getHeavyStateAndBoots() { return i_checkNoResetFlg0(FLG0_HVY_STATE); }
bool checkEnemyAttentionLock() const { return i_checkResetFlg0(RFLG0_ENEMY_ATTN_LOCK); }
bool getHeavyStateAndBoots() { return checkNoResetFlg0(FLG0_HVY_STATE); }
bool checkEnemyAttentionLock() const { return checkResetFlg0(RFLG0_ENEMY_ATTN_LOCK); }
bool checkCanoeSlider() const { return mSpecialMode == 0x2D; }
bool checkGoatStopGame() const { return mSpecialMode == 0x2A; }
bool i_checkGoronSideMove() const { return mSpecialMode == 0x2B; }
u8 getCutType() const { return mCutType; }
u16 getSwordAtUpTime() const { return mSwordUpTimer; }
s16 getDamageWaitTimer() const { return mDamageTimer; }
bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); }
bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); }
bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
bool checkWaterInMove() const { return checkNoResetFlg0(FLG0_UNDERWATER); }
bool checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCN_CHG_START); }
bool checkFrontRollCrash() const { return checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); }
bool checkFreezeDamage() const { return i_checkNoResetFlg1(FLG1_UNK_40000000); }
bool checkWolfTagLockJumpReady() const { return i_checkResetFlg0(RFLG0_UNK_20000); }
bool getGrabUpEnd() const { return i_checkResetFlg0(RFLG0_GRAB_UP_END); }
bool getGrabPutStart() const { return i_checkResetFlg0(RFLG0_GRAB_PUT_START); }
bool checkFreezeDamage() const { return checkNoResetFlg1(FLG1_UNK_40000000); }
bool checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_UNK_20000); }
bool getGrabUpEnd() const { return checkResetFlg0(RFLG0_GRAB_UP_END); }
bool getGrabPutStart() const { return checkResetFlg0(RFLG0_GRAB_PUT_START); }
void onBossRoomWait() { i_onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); }
void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
void onNotHang() { i_onEndResetFlg0(ERFLG0_NOT_HANG); }
void onShieldBackBone() { i_onEndResetFlg1(ERFLG1_GANON_FINISH); }
void onWolfEyeKeep() { i_onEndResetFlg1(ERFLG1_WOLF_EYE_KEEP); }
void onFogFade() { i_onNoResetFlg2(FLG2_UNK_4000); }
BOOL checkStickArrowReset() const { return i_checkResetFlg0(RFLG0_UNK_1); }
void onBossRoomWait() { onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); }
void onForceAutoJump() { onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
void onNotAutoJump() { onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
void onNotHang() { onEndResetFlg0(ERFLG0_NOT_HANG); }
void onShieldBackBone() { onEndResetFlg1(ERFLG1_GANON_FINISH); }
void onWolfEyeKeep() { onEndResetFlg1(ERFLG1_WOLF_EYE_KEEP); }
void onFogFade() { onNoResetFlg2(FLG2_UNK_4000); }
BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_UNK_1); }
void offCargoCarry() {
if (checkCargoCarry()) {
@@ -775,7 +756,7 @@ public:
}
void offGoronSideMove() {
if (i_checkGoronSideMove()) {
if (checkGoronSideMove()) {
mSpecialMode = 0;
}
}
@@ -785,71 +766,67 @@ public:
BOOL checkMidnaWarp() const { return 0; }
// some functions use these function as an inline
// is there a better way to handle this?
u32 i_checkNoResetFlg0(daPy_FLG0 i_flag) const { return mNoResetFlg0 & i_flag; }
u32 i_checkNoResetFlg1(daPy_FLG1 i_flag) const { return mNoResetFlg1 & i_flag; }
u32 i_checkNoResetFlg2(daPy_FLG2 i_flag) const { return mNoResetFlg2 & i_flag; }
u32 i_checkNoResetFlg3(daPy_FLG3 i_flag) const { return mNoResetFlg3 & i_flag; }
u32 checkNoResetFlg0(daPy_FLG0 i_flag) const { return mNoResetFlg0 & i_flag; }
u32 checkNoResetFlg1(daPy_FLG1 i_flag) const { return mNoResetFlg1 & i_flag; }
u32 checkNoResetFlg2(daPy_FLG2 i_flag) const { return mNoResetFlg2 & i_flag; }
u32 checkNoResetFlg3(daPy_FLG3 i_flag) const { return mNoResetFlg3 & i_flag; }
void i_onNoResetFlg0(int i_flag) { mNoResetFlg0 |= i_flag; }
void i_onNoResetFlg1(int i_flag) { mNoResetFlg1 |= i_flag; }
void i_onNoResetFlg2(int i_flag) { mNoResetFlg2 |= i_flag; }
void i_onNoResetFlg3(int i_flag) { mNoResetFlg3 |= i_flag; }
void onNoResetFlg0(daPy_FLG0 i_flag) { mNoResetFlg0 |= i_flag; }
void onNoResetFlg1(daPy_FLG1 i_flag) { mNoResetFlg1 |= i_flag; }
void onNoResetFlg2(daPy_FLG2 i_flag) { mNoResetFlg2 |= i_flag; }
void onNoResetFlg3(daPy_FLG3 i_flag) { mNoResetFlg3 |= i_flag; }
void i_offNoResetFlg0(int i_flag) { mNoResetFlg0 &= ~i_flag; }
void i_offNoResetFlg1(int i_flag) { mNoResetFlg1 &= ~i_flag; }
void i_offNoResetFlg2(int i_flag) { mNoResetFlg2 &= ~i_flag; }
void i_offNoResetFlg3(int i_flag) { mNoResetFlg3 &= ~i_flag; }
void offNoResetFlg0(daPy_FLG0 i_flag) { mNoResetFlg0 &= ~i_flag; }
void offNoResetFlg1(daPy_FLG1 i_flag) { mNoResetFlg1 &= ~i_flag; }
void offNoResetFlg2(daPy_FLG2 i_flag) { mNoResetFlg2 &= ~i_flag; }
void offNoResetFlg3(daPy_FLG3 i_flag) { mNoResetFlg3 &= ~i_flag; }
void i_offResetFlg0(int flag) { mResetFlg0 &= ~flag; }
void i_offResetFlg1(int flag) { mResetFlg1 &= ~flag; }
void i_onResetFlg0(int flag) { mResetFlg0 |= flag; }
void i_onResetFlg1(int flag) { mResetFlg1 |= flag; }
void offResetFlg0(daPy_RFLG0 flag) { mResetFlg0 &= ~flag; }
void offResetFlg1(daPy_RFLG1 flag) { mResetFlg1 &= ~flag; }
void onResetFlg0(daPy_RFLG0 flag) { mResetFlg0 |= flag; }
void onResetFlg1(daPy_RFLG1 flag) { mResetFlg1 |= flag; }
void i_onEndResetFlg0(int i_flag) { mEndResetFlg0 |= i_flag; }
void i_onEndResetFlg2(int i_flag) { mEndResetFlg2 |= i_flag; }
void i_offEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 &= ~i_flag; }
void onEndResetFlg0(daPy_ERFLG0 i_flag) { mEndResetFlg0 |= i_flag; }
void onEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 |= i_flag; }
void offEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 &= ~i_flag; }
u32 i_checkResetFlg0(daPy_py_c::daPy_RFLG0 i_flag) const { return mResetFlg0 & i_flag; }
u32 checkResetFlg1(daPy_py_c::daPy_RFLG1 i_flag) const { return mResetFlg1 & i_flag; }
u32 checkResetFlg0(daPy_RFLG0 i_flag) const { return mResetFlg0 & i_flag; }
u32 checkResetFlg1(daPy_RFLG1 i_flag) const { return mResetFlg1 & i_flag; }
u32 i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 i_flag) const { return mEndResetFlg0 & i_flag; }
u32 i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 i_flag) const { return mEndResetFlg1 & i_flag; }
u32 i_checkEndResetFlg2(daPy_py_c::daPy_ERFLG2 i_flag) const { return mEndResetFlg2 & i_flag; }
u32 checkEndResetFlg0(daPy_ERFLG0 i_flag) const { return mEndResetFlg0 & i_flag; }
u32 checkEndResetFlg1(daPy_ERFLG1 i_flag) const { return mEndResetFlg1 & i_flag; }
u32 checkEndResetFlg2(daPy_ERFLG2 i_flag) const { return mEndResetFlg2 & i_flag; }
void i_onEndResetFlg1(daPy_ERFLG1 i_flag) { mEndResetFlg1 |= i_flag; }
void onEndResetFlg1(daPy_ERFLG1 i_flag) { mEndResetFlg1 |= i_flag; }
cXyz* getLeftHandPosP() { return &mLeftHandPos; }
cXyz* getRightHandPosP() { return &mRightHandPos; }
cXyz* i_getLeftFootPosP() { return &mLeftFootPos; }
cXyz* i_getRightFootPosP() { return &mRightFootPos; }
u32 i_checkWolf() const { return i_checkNoResetFlg1(FLG1_IS_WOLF); }
BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
BOOL i_checkMagneBootsOn() const { return i_checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
bool i_checkMidnaRide() const { return i_checkNoResetFlg0(FLG0_MIDNA_RIDE); }
void i_onPlayerNoDraw() { i_onNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void i_offPlayerNoDraw() { i_offNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void i_onPushPullKeep() { i_onNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
void i_offPushPullKeep() { i_offNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
void onLightSwordGetEffect() { i_onEndResetFlg2(FLG2_UNK_10); }
u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); }
BOOL checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
BOOL checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
bool checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); }
void onPlayerNoDraw() { onNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void offPlayerNoDraw() { offNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void onPushPullKeep() { onNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
void offPushPullKeep() { offNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_UNK_10); }
u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
u32 checkBoarSingleBattle() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
void i_changeOriginalDemo() {
void changeOriginalDemo() {
mDemo.setOriginalDemoType();
mDemo.setParam0(0);
}
void i_changeDemoMode(u32 i_demoMode, int i_param0, int i_param1, s16 i_param2) {
void changeDemoMode(u32 i_demoMode, int i_param0, int i_param1, s16 i_param2) {
mDemo.setDemoMode(i_demoMode);
mDemo.setParam0(i_param0);
mDemo.setParam1(i_param1);
mDemo.setParam2(i_param2);
}
void i_changeDemoPos0(const cXyz* i_posP) { mDemo.setPos0(i_posP); }
void changeDemoPos0(const cXyz* i_posP) { mDemo.setPos0(i_posP); }
void changeDemoMoveAngle(s16 i_angle) { mDemo.setMoveAngle(i_angle); }
@@ -860,10 +837,10 @@ public:
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
inline static BOOL i_checkNowWolf() { return dComIfGp_getLinkPlayer()->i_checkWolf(); }
inline static BOOL i_checkNowWolf() { return dComIfGp_getLinkPlayer()->checkWolf(); }
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;
inline static BOOL i_checkFirstMidnaDemo() { return i_dComIfGs_isEventBit(0xc10); }
inline static BOOL i_checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
static int checkNowWolfPowerUp() { return checkNowWolfEyeUp(); }
static daMidna_c* getMidnaActor() { return m_midnaActor; }
@@ -872,7 +849,7 @@ public:
// static void onWolfEnemyCatch(fopAc_ac_c* i_actorP) { onWolfEnemyBiteAll(i_actorP,8);}
bool checkWolfEnemyCatchOwn(fopAc_ac_c* i_actorP) { return checkWolfEnemyBiteAllOwn(i_actorP); }
bool checkWolfEnemyLeftThrow() const { return i_checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); }
bool checkWolfEnemyLeftThrow() const { return checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); }
static daMidna_c* m_midnaActor;
};
include/d/com/d_com_inf_game.h
+26 -47
View File
@@ -981,10 +981,6 @@ void dComIfGs_onStageSwitch(int i_stageNo, int i_no);
void dComIfGs_offStageSwitch(int i_stageNo, int i_no);
void dComIfGs_PolyDamageOff_Set(s8 param_0);
u8 dComIfGs_staffroll_next_go_check();
BOOL dComIfGs_isEventBit(u16 i_flag);
int dComIfGs_isItemFirstBit(u8 i_no);
u16 dComIfGs_getRupee();
static u16 dComIfGs_getLife();
s8 dComIfGs_BossLife_public_Get();
u8 dComIfGs_checkGetInsectNum();
u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx);
@@ -993,11 +989,11 @@ inline void dComIfGs_init() {
g_dComIfG_gameInfo.info.init();
}
inline int i_dComIfGs_isItemFirstBit(u8 i_no) {
inline int dComIfGs_isItemFirstBit(u8 i_no) {
return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no);
}
inline u16 i_dComIfGs_getRupee() {
inline u16 dComIfGs_getRupee() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupee();
}
@@ -1124,7 +1120,7 @@ inline void dComIfGs_onEventBit(u16 i_flag) {
// debug rom says `i_flag` is not const, but it's needed to match in some places?
// missing some other inline maybe?
inline BOOL i_dComIfGs_isEventBit(const u16 i_flag) {
inline BOOL dComIfGs_isEventBit(const u16 i_flag) {
return g_dComIfG_gameInfo.info.getEvent().isEventBit(i_flag);
}
@@ -1221,7 +1217,7 @@ inline u16 dComIfGs_getMaxLife() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMaxLife();
}
inline u16 i_dComIfGs_getLife() {
inline u16 dComIfGs_getLife() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife();
}
@@ -1691,7 +1687,7 @@ inline u8 dComIfGs_getTmpReg(u16 i_reg) {
return g_dComIfG_gameInfo.info.getTmp().getEventReg(i_reg);
}
inline u8 i_dComIfGs_getEventReg(u16 reg) {
inline u8 dComIfGs_getEventReg(u16 reg) {
return g_dComIfG_gameInfo.info.getEvent().getEventReg(reg);
}
@@ -1890,23 +1886,6 @@ JKRExpHeap* dComIfGp_getSubHeap2D(int flag);
void dComIfGp_world_dark_set(u8);
u8 dComIfGp_getNowLevel();
void dComIfGp_calcNowRegion();
daHorse_c* dComIfGp_getHorseActor();
static BOOL dComIfGp_event_runCheck();
static s32 dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2);
static u16 dComIfGp_event_chkEventFlag(u16 flag);
static s8 dComIfGp_getPlayerCameraID(int idx);
static dEvent_manager_c& dComIfGp_getEventManager();
static u32 dComIfGp_checkPlayerStatus0(int param_0, u32 param_1);
static u32 dComIfGp_checkPlayerStatus1(int param_0, u32 param_1);
static dEvt_control_c& dComIfGp_getEvent();
static bool dComIfGp_evmng_startCheck(char const* param_0);
static dStage_stageDt_c* dComIfGp_getStage();
void dComIfGp_setItemLifeCount(f32 amount, u8 type);
void dComIfGp_setItemRupeeCount(s32 param_0);
static u8 dComIfGp_getDoStatus();
static u8 dComIfGp_getRStatus();
static dAttCatch_c* dComIfGp_att_getCatghTarget();
static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1);
bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle);
void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num);
bool dComIfGp_isLightDropMapVisible();
@@ -1919,19 +1898,19 @@ inline void dComIfGp_init() {
g_dComIfG_gameInfo.play.init();
}
inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
inline bool dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag);
}
inline bool i_dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
inline bool dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag);
}
inline void i_dComIfGp_setItemLifeCount(float amount, u8 type) {
inline void dComIfGp_setItemLifeCount(float amount, u8 type) {
g_dComIfG_gameInfo.play.setItemLifeCount(amount, type);
}
inline void i_dComIfGp_setItemRupeeCount(int amount) {
inline void dComIfGp_setItemRupeeCount(int amount) {
g_dComIfG_gameInfo.play.setItemRupeeCount(amount);
}
@@ -1951,7 +1930,7 @@ inline u8 dComIfGp_att_getCatchChgItem() {
return dComIfGp_getAttention().getCatchChgItem();
}
inline fopAc_ac_c* i_dComIfGp_att_getCatghTarget() {
inline fopAc_ac_c* dComIfGp_att_getCatghTarget() {
return dComIfGp_getAttention().getCatghTarget();
}
@@ -1987,11 +1966,11 @@ inline fopAc_ac_c* dComIfGp_getPlayer(int idx) {
return g_dComIfG_gameInfo.play.getPlayer(idx);
}
inline int i_dComIfGp_getPlayerCameraID(int idx) {
inline int dComIfGp_getPlayerCameraID(int idx) {
return g_dComIfG_gameInfo.play.getPlayerCameraID(idx);
}
inline daHorse_c* i_dComIfGp_getHorseActor() {
inline daHorse_c* dComIfGp_getHorseActor() {
return (daHorse_c*)g_dComIfG_gameInfo.play.getPlayerPtr(1);
}
@@ -2628,7 +2607,7 @@ inline void dComIfGp_clearPlayerStatus1(int param_0, u32 flag) {
g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 1, flag);
}
inline dStage_stageDt_c* i_dComIfGp_getStage() {
inline dStage_stageDt_c* dComIfGp_getStage() {
return &g_dComIfG_gameInfo.play.getStage();
}
@@ -3003,7 +2982,7 @@ inline void dComIfGp_deleteSimpleModel() {
g_dComIfG_gameInfo.play.deleteSimpleModel();
}
inline void i_dComIfGp_setHitMark(u16 i_hitmark, fopAc_ac_c* param_1, const cXyz* param_2,
inline void dComIfGp_setHitMark(u16 i_hitmark, fopAc_ac_c* param_1, const cXyz* param_2,
const csXyz* param_3, const cXyz* param_4, u32 i_atType) {
g_dComIfG_gameInfo.play.getParticle()->setHitMark(i_hitmark, param_1, param_2, param_3, param_4,
i_atType);
@@ -3108,11 +3087,11 @@ inline void dComIfGp_roomControl_zoneCountCheck(int i_roomNo) {
g_dComIfG_gameInfo.play.mRoomControl.zoneCountCheck(i_roomNo);
}
inline u8 i_dComIfGp_getRStatus() {
inline u8 dComIfGp_getRStatus() {
return g_dComIfG_gameInfo.play.getRStatus();
}
inline void i_dComIfGp_setBottleStatus(u8 param_0, u8 param_1) {
inline void dComIfGp_setBottleStatus(u8 param_0, u8 param_1) {
g_dComIfG_gameInfo.play.setBottleStatus(param_0, param_1);
}
@@ -3120,7 +3099,7 @@ inline void dComIfGp_setBottleStatusForce(u8 param_0, u8 param_1) {
g_dComIfG_gameInfo.play.setBottleStatusForce(param_0, param_1);
}
inline u8 i_dComIfGp_getDoStatus() {
inline u8 dComIfGp_getDoStatus() {
return g_dComIfG_gameInfo.play.getDoStatus();
}
@@ -3128,11 +3107,11 @@ inline u8 dComIfGp_getAdvanceDirection() {
return g_dComIfG_gameInfo.play.getDirection();
}
inline dEvt_control_c& i_dComIfGp_getEvent() {
inline dEvt_control_c& dComIfGp_getEvent() {
return g_dComIfG_gameInfo.play.getEvent();
}
inline dEvent_manager_c& i_dComIfGp_getEventManager() {
inline dEvent_manager_c& dComIfGp_getEventManager() {
return g_dComIfG_gameInfo.play.getEvtManager();
}
@@ -3170,11 +3149,11 @@ inline void dComIfGp_event_setGtItm(int i_itemNo) {
g_dComIfG_gameInfo.play.getEvent().setGtItm(i_itemNo);
}
inline void i_dComIfGp_event_reset() {
inline void dComIfGp_event_reset() {
g_dComIfG_gameInfo.play.getEvent().reset();
}
inline void i_dComIfGp_event_remove() {
inline void dComIfGp_event_remove() {
g_dComIfG_gameInfo.play.getEvent().remove();
}
@@ -3194,7 +3173,7 @@ inline cXyz* dComIfGp_evmng_getGoal() {
return dComIfGp_getPEvtManager()->getGoal();
}
inline BOOL i_dComIfGp_evmng_startCheck(char const* i_event) {
inline BOOL dComIfGp_evmng_startCheck(char const* i_event) {
return g_dComIfG_gameInfo.play.getEvtManager().startCheckOld(i_event);
}
@@ -3250,7 +3229,7 @@ inline fopAc_ac_c* dComIfGp_event_getPt2() {
return g_dComIfG_gameInfo.play.getEvent().convPId(pt2);
}
inline BOOL i_dComIfGp_event_runCheck() {
inline BOOL dComIfGp_event_runCheck() {
return g_dComIfG_gameInfo.play.getEvent().runCheck();
}
@@ -3259,13 +3238,13 @@ inline f32 dComIfGp_event_getCullRate() {
}
inline u16 dComIfGp_event_checkHind(u16 flag) {
if (!i_dComIfGp_event_runCheck()) {
if (!dComIfGp_event_runCheck()) {
return false;
}
return g_dComIfG_gameInfo.play.getEvent().checkHind(flag);
}
inline u16 i_dComIfGp_event_chkEventFlag(u16 flag) {
inline u16 dComIfGp_event_chkEventFlag(u16 flag) {
return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(flag);
}
@@ -3281,7 +3260,7 @@ inline u8 dComIfGp_event_getMode() {
return g_dComIfG_gameInfo.play.getEvent().getMode();
}
inline int i_dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2) {
inline int dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2) {
return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, param_2);
}
include/d/d_stage.h
+1
View File
@@ -761,6 +761,7 @@ extern s8 mOldStayNo__20dStage_roomControl_c;
extern s8 mNextStayNo__20dStage_roomControl_c;
extern s8 m_time_pass__20dStage_roomControl_c;
extern u8 mNoChangeRoom__20dStage_roomControl_c;
extern s8 data_804505F0; // roomReadId
class dStage_roomControl_c {
public:
include/d/event/d_event.h
+3 -6
View File
@@ -138,9 +138,6 @@ public:
void setPtI_Id(unsigned int id);
void setPtD(void* ptr);
void setGtItm(u8 itemNo);
BOOL isOrderOK();
/* 807DFAD8 */ void checkSkipEdge();
/* 807E2908 */ void startCheckSkipEdge(void*);
u16 chkFlag2(u16 flag) { return flag & mFlag2; }
BOOL runCheck() { return mEventStatus != 0; }
@@ -158,15 +155,15 @@ public:
void setCullRate(f32 f) { mCullRate = f; }
BOOL chkTalkXY() { return field_0xed == 1 || field_0xed == 2; }
bool i_isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; }
bool isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; }
fopAc_ac_c* getPt1() { return convPId(mPt1); }
fopAc_ac_c* getPt2() { return convPId(mPt2); }
fopAc_ac_c* getPtT() { return convPId(mPtT); }
bool isChangeOK(void* param_0) { return mChangeOK == param_0; }
u8 getPreItemNo() { return mPreItemNo; }
u8 getGtItm() { return mGtItm; }
void i_startCheckSkipEdge(void* param_0) { setSkipProc(param_0, dEv_noFinishSkipProc, 0); }
bool i_checkSkipEdge() { return chkFlag2(8) != false; }
void startCheckSkipEdge(void* param_0) { setSkipProc(param_0, dEv_noFinishSkipProc, 0); }
bool checkSkipEdge() { return chkFlag2(8) != false; }
public:
/* 0x000 */ u8 field_0x0[4];
include/d/kankyo/d_kankyo.h
+1 -1
View File
@@ -522,7 +522,7 @@ extern dScnKy_env_light_c g_env_light;
STATIC_ASSERT(sizeof(dScnKy_env_light_c) == 4880);
inline dScnKy_env_light_c* i_dKy_getEnvlight() {
inline dScnKy_env_light_c* dKy_getEnvlight() {
return &g_env_light;
}
include/f_op/f_op_actor_mng.h
+6 -7
View File
@@ -364,19 +364,19 @@ inline void dComIfGs_offSwitch(int i_no, int i_roomNo);
inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo);
inline void dComIfGs_offActor(int i_no, int i_roomNo);
inline void i_fopAcM_onSwitch(const fopAc_ac_c* pActor, int sw) {
inline void fopAcM_onSwitch(const fopAc_ac_c* pActor, int sw) {
return dComIfGs_onSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
}
inline void i_fopAcM_offSwitch(const fopAc_ac_c* pActor, int sw) {
inline void fopAcM_offSwitch(const fopAc_ac_c* pActor, int sw) {
return dComIfGs_offSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
}
inline BOOL i_fopAcM_isSwitch(const fopAc_ac_c* item, int sw) {
inline BOOL fopAcM_isSwitch(const fopAc_ac_c* item, int sw) {
return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(item));
}
inline fopAc_ac_c* i_fopAcM_SearchByName(s16 proc_id) {
inline fopAc_ac_c* fopAcM_SearchByName(s16 proc_id) {
return (fopAc_ac_c*)fopAcIt_Judge(fpcSch_JudgeForPName, &proc_id);
}
@@ -514,7 +514,6 @@ s32 fopAcM_orderTreasureEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16);
fopAc_ac_c* fopAcM_getTalkEventPartner(const fopAc_ac_c*);
fopAc_ac_c* fopAcM_getItemEventPartner(const fopAc_ac_c*);
fopAc_ac_c* fopAcM_getEventPartner(const fopAc_ac_c*);
static void fopAcM_onSwitch(fopAc_ac_c const* param_0, int param_1);
s32 fopAcM_createItemForPresentDemo(cXyz const* p_pos, int i_itemNo, u8 param_2, int i_itemBitNo,
int i_roomNo, csXyz const* p_angle, cXyz const* p_scale);
@@ -648,12 +647,12 @@ inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
i_mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo));
mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo));
}
inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
i_mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo));
mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo));
}
inline void fopAcM_offActor(fopAc_ac_c* pActor, u32 flag) {
include/f_pc/f_pc_base.h
-5
View File
@@ -43,9 +43,4 @@ s32 fpcBs_Delete(base_process_class* pProc);
base_process_class* fpcBs_Create(s16 pProcTypeID, unsigned int pProcID, void* pData);
s32 fpcBs_SubCreate(base_process_class* pProc);
extern "C" {
void fpcBs_MakeOfType__FPi(void);
void fpcBs_Is_JustOfType__Fii(void);
}
#endif
include/f_pc/f_pc_executor.h
-8
View File
@@ -16,12 +16,4 @@ s32 fpcEx_Execute(base_process_class* pProc);
s32 fpcEx_ToExecuteQ(base_process_class* pProc);
void fpcEx_Handler(fpcLnIt_QueueFunc pFunc);
inline base_process_class* i_fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) {
return fpcEx_Search(pFunc, pUserData);
}
extern "C" {
void fpcEx_IsExist__FUi(void);
}
#endif
include/f_pc/f_pc_manager.h
+10 -5
View File
@@ -6,6 +6,7 @@
#include "f_pc/f_pc_leaf.h"
#include "f_pc/f_pc_node.h"
#include "f_pc/f_pc_stdcreate_req.h"
#include "f_pc/f_pc_searcher.h"
enum {
fpcM_ERROR_PROCESS_ID_e = -1,
@@ -70,13 +71,21 @@ inline void* fpcM_LyJudge(process_node_class* i_node, fpcLyIt_JudgeFunc i_func,
return fpcLyIt_Judge(&i_node->mLayer, i_func, i_data);
}
inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) {
return fpcEx_Search(pFunc, pUserData);
}
inline base_process_class* fpcM_SearchByName(s16 name) {
return (base_process_class*)fpcLyIt_AllJudge(fpcSch_JudgeForPName, &name);
}
void fpcM_Draw(void* pProc);
s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc);
s32 fpcM_Execute(void* pProc);
s32 fpcM_Delete(void* pProc);
BOOL fpcM_IsCreating(unsigned int pID);
void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2);
void fpcM_Init(void);
void fpcM_Init();
base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3,
void* pData);
s32 fpcM_IsPause(void* pProc, u8 param_2);
@@ -84,8 +93,4 @@ void fpcM_PauseEnable(void* pProc, u8 param_2);
void fpcM_PauseDisable(void* pProc, u8 param_2);
void* fpcM_JudgeInLayer(unsigned int pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData);
extern "C" {
void fpcM_Delete__FPv(void);
}
#endif
include/f_pc/f_pc_priority.h
-2
View File
@@ -33,6 +33,4 @@ s32 fpcPi_Handler(void);
s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer, u16 listID,
u16 priority);
extern s8 data_804505F0; // roomReadId
#endif
include/f_pc/f_pc_searcher.h
-8
View File
@@ -8,12 +8,4 @@
void* fpcSch_JudgeForPName(void* pProc, void* pUserData);
void* fpcSch_JudgeByID(void* pProc, void* pUserData);
extern "C" {
void fpcSch_JudgeForPName__FPvPv(void);
}
inline base_process_class* i_fpcM_SearchByName(s16 name) {
return (base_process_class*)fpcLyIt_AllJudge(fpcSch_JudgeForPName, &name);
}
#endif
include/f_pc/f_pc_stdcreate_req.h
-4
View File
@@ -27,8 +27,4 @@ s32 fpcSCtRq_Cancel(standard_create_request_class*);
s32 fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4,
void* param_5);
extern "C" {
void fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv(void);
}
#endif
include/m_Do/m_Do_Reset.h
+1 -2
View File
@@ -50,8 +50,7 @@ public:
static void on3ButtonReset() { mResetData->m3ButtonReset = 1; }
static void onShutdown() { mResetData->mShutdown = true; }
static mDoRstData* getResetData();
static mDoRstData* i_getResetData() { return mResetData; }
static mDoRstData* getResetData() { return mResetData; }
static void setResetData(mDoRstData* rstData) { mResetData = rstData; }
static mDoRstData* mResetData;
include/m_Do/m_Do_audio.h
+1 -2
View File
@@ -33,7 +33,6 @@ void mDoAud_setSceneName(char const* spot, s32 room, s32 layer);
s32 mDoAud_load1stDynamicWave();
static void mDoAud_setLinkGroupInfo(u8 param_0);
static void mDoAud_setLinkHp(s32 param_0, s32 param_1);
static void mDoAud_seStartLevel(u32 param_0, Vec const* param_1, u32 param_2, s8 param_3);
void mDoAud_setFadeInStart(u8 param_0);
void mDoAud_setFadeOutStart(u8 param_0);
@@ -82,7 +81,7 @@ inline void mDoAud_seStart(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_re
-1.0f, -1.0f, 0);
}
inline void i_mDoAud_seStartLevel(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_reverb) {
inline void mDoAud_seStartLevel(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_reverb) {
Z2AudioMgr::getInterface()->seStartLevel(i_sfxID, i_sePos, param_2, i_reverb, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
include/rel/d/a/d_a_horse/d_a_horse.h
+4 -6
View File
@@ -66,9 +66,7 @@ public:
/* 807E27BC */ void cancelOriginalDemo();
/* 807E27F8 */ void onDemoJumpDistance(f32, f32);
/* 807E28B8 */ void changeDemoPos0(cXyz const*);
/* 807E28D4 */ void changeDemoMode(u32, int);
/* 807E28E0 */ void setHorsePosAndAngle(cXyz const*, s16);
/* 807E2964 */ void changeOriginalDemo();
/* 80838498 */ void coHitCallbackBoarJump(fopAc_ac_c*);
/* 80838798 */ void coHitCallbackBoarHit(fopAc_ac_c*, dCcD_GObjInf*);
/* 80838904 */ void coHitCallbackCowHit(fopAc_ac_c*);
@@ -162,8 +160,8 @@ public:
f32 getLashMaxSpeedF() { return mLashMaxSpeedF; }
void changeDemoMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
void setDemoStickR(f32 stick) { mDemoStickR = stick; }
void i_changeDemoMode(u32 param_0, int param_1) { field_0x1740 = param_0; field_0x1728 = param_1; }
void i_changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; }
void changeDemoMode(u32 param_0, int param_1) { field_0x1740 = param_0; field_0x1728 = param_1; }
void changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; }
void i_setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*mpSetHorsePosAngleFn)(i_pos, i_angle); }
void onRideFlg() { (this->*mpOnRideFlgFn)(); }
void offRideFlg() { (this->*mpOffRideFlgFn)(); }
@@ -172,8 +170,8 @@ public:
void onEndResetStateFlg0(daHorse_ERFLG0 i_flag) { mEndResetStateFlg0 |= i_flag;}
void offNoDrawWait() { offStateFlg0(NO_DRAW_WAIT); }
bool checkSpecialWallHit(const cXyz& param_0) { return (this->*mpCheckSpecialWallHitFn)(param_0); }
MtxP getSaddleMtx() { return field_0x570->i_getAnmMtx(21); }
MtxP getRootMtx() { return field_0x570->i_getAnmMtx(0); }
MtxP getSaddleMtx() { return field_0x570->getAnmMtx(21); }
MtxP getRootMtx() { return field_0x570->getAnmMtx(0); }
f32 getAnmFrameMax(int i_idx) const { return field_0x5b0[i_idx].getEnd(); }
f32 getAnmFrame(int i_idx) const { return field_0x5b0[i_idx].getFrame(); }
s16 getAimNeckAngleY() const { return mAimNeckAngleY; }
include/rel/d/a/d_a_midna/d_a_midna.h
+2 -2
View File
@@ -138,7 +138,7 @@ public:
}
MtxP getMtxHairTop() {
return field_0x574->i_getAnmMtx(10);
return field_0x574->getAnmMtx(10);
}
bool checkReturnAnime() const {
@@ -171,7 +171,7 @@ public:
inline static BOOL checkMidnaRealBody();
static bool i_checkMidnaTired() {
return dComIfGs_isTransformLV(3) && !i_dComIfGs_isEventBit(0x1E08);
return dComIfGs_isTransformLV(3) && !dComIfGs_isEventBit(0x1E08);
}
void resetRatBody() {}
include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h
+1 -1
View File
@@ -22,7 +22,7 @@ public:
BOOL checkNormalRideMode() const;
void setRunRideMode();
MtxP getRideMtx() { return field_0x5e0->getModel()->i_getAnmMtx(15); }
MtxP getRideMtx() { return field_0x5e0->getModel()->getAnmMtx(15); }
f32 nowAnimeFrame() const { return field_0x5e0->getFrame(); }
s16 getWaitRollAngle() const { return mWaitRollAngle; }
bool checkGetOff() const { return speedF < 3.0f; }
include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h
+1 -1
View File
@@ -5,7 +5,7 @@
class e_yc_class : public fopEn_enemy_c {
public:
MtxP getLegR3Mtx() { return field_0x5B8->getModel()->i_getAnmMtx(28); }
MtxP getLegR3Mtx() { return field_0x5B8->getModel()->getAnmMtx(28); }
/* 0x5AC */ u8 field_0x5ac[0x5B8 - 0x5AC];
/* 0x5B8 */ mDoExt_McaMorfSO* field_0x5B8;
include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
u8 getSwNG() { return fopAcM_GetParamBit(this, 0x10, 8); }
u8 getSwTotal() { return fopAcM_GetParamBit(this, 0x18, 8); }
int getEventID() { return shape_angle.x & 0xff; }
u8 getNGSwStat() { return i_fopAcM_isSwitch(this, mSwNG); }
u8 getNGSwStat() { return fopAcM_isSwitch(this, mSwNG); }
/* 0x584 */ u8 mMode;
/* 0x585 */ u8 mSwTop;
include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h
+2 -2
View File
@@ -14,11 +14,11 @@ public:
field_0x598 = 1;
if (mLevel < 3) {
if (mpModel != NULL) {
mpModel->i_setBaseTRMtx(i_mtx);
mpModel->setBaseTRMtx(i_mtx);
}
} else {
if (mpMorf != NULL) {
mpMorf->getModel()->i_setBaseTRMtx(i_mtx);
mpMorf->getModel()->setBaseTRMtx(i_mtx);
}
}
}
include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h
+3 -3
View File
@@ -36,9 +36,9 @@ public:
void setAnmSpeed(f32 speed) { mpBck->setPlaySpeed(speed); }
bool isSwitch() {
return i_fopAcM_isSwitch(this, getSwitchNo()) ||
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) ||
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]);
return fopAcM_isSwitch(this, getSwitchNo()) ||
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) ||
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]);
}
void setAction(Mode_e i_action) {
include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h
+3 -3
View File
@@ -23,9 +23,9 @@ public:
void setAnmSpeed(f32 speed) { mpBck->setPlaySpeed(speed); }
bool isSwitch() {
return i_fopAcM_isSwitch(this, getSwitchNo()) ||
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) ||
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]);
return fopAcM_isSwitch(this, getSwitchNo()) ||
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) ||
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]);
}
/* 0x568 */ J3DModel* mpModel;
include/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
/* 80D5C01C */ ~daTagMwait_c();
/* 80D5C0A8 */ int execute();
bool checkEndMessage() {return i_fopAcM_isSwitch(this, mEnterSw); }
bool checkEndMessage() {return fopAcM_isSwitch(this, mEnterSw); }
/* 0x568 */ u8 mOnSw;
/* 0x569 */ u8 mEnterSw;
include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h
+2 -2
View File
@@ -76,14 +76,14 @@ public:
}
int execute() {
if (i_fopAcM_isSwitch(this,getSwitchNo())) {
if (fopAcM_isSwitch(this,getSwitchNo())) {
fopAcM_delete(this);
return 1;
} else {
f32 distance = fopAcM_searchPlayerDistanceXZ2(this);
if (distance < field_0x568) {
daNpcTheB_c* the_b = (daNpcTheB_c*)i_fpcM_SearchByName(PROC_NPC_THEB);
daNpcTheB_c* the_b = (daNpcTheB_c*)fpcM_SearchByName(PROC_NPC_THEB);
if (the_b) {
s8 roomNo = getRoomNo();
libs/JSystem/J3DGraphAnimator/J3DJoint.cpp
+1 -1
View File
@@ -185,7 +185,7 @@ J3DJoint::J3DJoint() {
/* 8032F254-8032F3F8 329B94 01A4+00 0/0 1/1 0/0 .text entryIn__8J3DJointFv */
void J3DJoint::entryIn() {
MtxP anmMtx = j3dSys.getModel()->i_getAnmMtx(mJntNo);
MtxP anmMtx = j3dSys.getModel()->getAnmMtx(mJntNo);
j3dSys.getDrawBuffer(0)->setZMtx(anmMtx);
j3dSys.getDrawBuffer(1)->setZMtx(anmMtx);
for (J3DMaterial* mesh = mMesh; mesh != NULL;) {
libs/JSystem/J3DGraphAnimator/J3DModel.cpp
+2 -2
View File
@@ -369,7 +369,7 @@ void J3DModel::calcMaterial() {
}
int jntNo = material->getJoint()->getJntNo();
material->calc(i_getAnmMtx(jntNo));
material->calc(getAnmMtx(jntNo));
}
}
@@ -384,7 +384,7 @@ void J3DModel::calcDiffTexMtx() {
for (u16 i = 0; i < num; i++) {
j3dSys.setMatPacket(getMatPacket(i));
J3DMaterial* materialNode = getModelData()->getMaterialNodePointer(i);
materialNode->calcDiffTexMtx(i_getAnmMtx(materialNode->getJoint()->getJntNo()));
materialNode->calcDiffTexMtx(getAnmMtx(materialNode->getJoint()->getJntNo()));
}
num = getModelData()->getShapeNum();
libs/JSystem/JKernel/JKRAram.cpp
+3 -3
View File
@@ -243,7 +243,7 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS
}
if (rv == NULL) {
i_JKRFree(szpSpace);
JKRFree(szpSpace);
return NULL;
} else {
changeGroupIdIfNeed(rv, id);
@@ -358,9 +358,9 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32
*tsPtr = 0;
decompSZS_subroutine(firstSrcData(), (u8*)dst);
i_JKRFree(szpBuf);
JKRFree(szpBuf);
if (refBuf) {
i_JKRFree(refBuf);
JKRFree(refBuf);
}
DCStoreRangeNoSync(dst, *tsPtr);
libs/JSystem/JKernel/JKRAramArchive.cpp
+4 -4
View File
@@ -133,7 +133,7 @@ JKRAramArchive::~JKRAramArchive() {
}
if (mExpandedSize != NULL) {
i_JKRFree(mExpandedSize);
JKRFree(mExpandedSize);
mExpandedSize = NULL;
}
@@ -208,7 +208,7 @@ bool JKRAramArchive::open(s32 entryNum) {
mExpandedSize = (s32*)JKRAllocFromHeap(mHeap, mArcInfoBlock->num_file_entries << 2,
abs(alignment));
if (mExpandedSize == NULL) {
i_JKRFree(mArcInfoBlock);
JKRFree(mArcInfoBlock);
mMountMode = 0;
goto cleanup;
}
@@ -221,10 +221,10 @@ bool JKRAramArchive::open(s32 entryNum) {
mMountDirection == MOUNT_DIRECTION_HEAD ? JKRAramHeap::HEAD : JKRAramHeap::TAIL);
if (mBlock == NULL) {
if (mArcInfoBlock) {
i_JKRFree(mArcInfoBlock);
JKRFree(mArcInfoBlock);
}
if (mExpandedSize) {
i_JKRFree(mExpandedSize);
JKRFree(mExpandedSize);
}
mMountMode = 0;
} else {
libs/JSystem/JKernel/JKRAramStream.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
}
if (command->mAllocatedTransferBuffer) {
i_JKRFree(buffer);
JKRFree(buffer);
command->mAllocatedTransferBuffer = false;
}
}
libs/JSystem/JKernel/JKRCompArchive.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ JKRCompArchive::~JKRCompArchive() {
}
if (mExpandedSize != NULL) {
i_JKRFree(mExpandedSize);
JKRFree(mExpandedSize);
mExpandedSize = NULL;
}
libs/JSystem/JKernel/JKRDvdArchive.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ JKRDvdArchive::~JKRDvdArchive() {
}
if (mExpandedSize) {
i_JKRFree(mExpandedSize);
JKRFree(mExpandedSize);
mExpandedSize = NULL;
}
libs/JSystem/JKernel/JKRDvdRipper.cpp
+10 -10
View File
@@ -134,7 +134,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
{
if (hasAllocated == true)
{
i_JKRFree(dst);
JKRFree(dst);
return NULL;
}
}
@@ -172,7 +172,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
{
if (hasAllocated == true)
{
i_JKRFree(dst);
JKRFree(dst);
}
return NULL;
}
@@ -196,7 +196,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
if (readBytes == -3 || !errorRetry)
{
if (hasAllocated == true)
i_JKRFree(dst);
JKRFree(dst);
return NULL;
}
VIWaitForRetrace();
@@ -232,16 +232,16 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
if (readBytes == -3 || !errorRetry)
{
if (hasAllocated == true)
i_JKRFree(dst);
JKRFree(dst);
i_JKRFree(mem);
JKRFree(mem);
return NULL;
}
VIWaitForRetrace();
}
DCInvalidateRange(mem, fileSizeAligned);
JKRDecompress(mem, dst, expandSize, offset);
i_JKRFree(mem);
JKRFree(mem);
if (param_8)
{
*param_8 = expandSize;
@@ -253,14 +253,14 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
if (JKRDecompressFromDVD(dvdFile, dst, fileSizeAligned, expandSize, offset, 0, param_8) != 0u)
{
if (hasAllocated)
i_JKRFree(dst);
JKRFree(dst);
dst = NULL;
}
return dst;
}
else if (hasAllocated)
{
i_JKRFree(dst);
JKRFree(dst);
dst = NULL;
}
return NULL;
@@ -367,10 +367,10 @@ static int JKRDecompressFromDVD(JKRDvdFile* dvdFile, void* dst, u32 fileSize, u3
*tsPtr = 0;
u8 *data = firstSrcData();
u32 result = (data != NULL) ? decompSZS_subroutine(data, (u8 *)dst) : -1; // figure out correct datatypes
i_JKRFree(szpBuf);
JKRFree(szpBuf);
if (refBuf)
{
i_JKRFree(refBuf);
JKRFree(refBuf);
}
DCStoreRangeNoSync(dst, *tsPtr);
OSUnlockMutex(&decompMutex);
libs/JSystem/JKernel/JKRExpHeap.cpp
+1 -1
View File
@@ -137,7 +137,7 @@ JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* parent, bool errorFlag) {
new (memory) JKRExpHeap(dataPtr, alignedSize - expHeapSize, parent, errorFlag);
if (newHeap == NULL) {
i_JKRFree(memory);
JKRFree(memory);
return NULL;
}
libs/JSystem/JKernel/JKRThread.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ JKRThread::~JKRThread() {
JKRFreeToHeap(mHeap, mStackMemory);
JKRFreeToHeap(mHeap, mThreadRecord);
}
i_JKRFree(mMessages);
JKRFree(mMessages);
}
/* 802D1830-802D18A4 2CC170 0074+00 3/3 0/0 0/0 .text setCommon_mesgQueue__9JKRThreadFP7JKRHeapi
libs/Z2AudioLib/Z2EnvSeMgr.cpp
+1 -1
View File
@@ -608,7 +608,7 @@ void Z2EnvSeMgr::framework() {
int sceneNum = Z2GetSceneMgr()->getCurrentSceneNum();
if (field_0x64.getPosCount() >= 0) {
if (field_0x214 == 0x12 ||
(i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[104]) && !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[250])))
(dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[104]) && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[250])))
{
int lVar12 = 0;
if (sceneNum == 0x17 || sceneNum == 0x18 || (sceneNum == 0x19)) {
libs/Z2AudioLib/Z2StatusMgr.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ void Z2StatusMgr::heartGaugeOn() {
/* 802B5F7C-802B60CC 2B08BC 0150+00 0/0 1/1 0/0 .text processHeartGaugeSound__11Z2StatusMgrFv */
void Z2StatusMgr::processHeartGaugeSound() {
if (!i_dComIfGp_event_runCheck() && mHeartGaugeOn != 0) {
if (!dComIfGp_event_runCheck() && mHeartGaugeOn != 0) {
if (dScnPly_c::isPause()) {
mHeartGaugeOn--;
}
obj_files.mk
+1
View File
@@ -1086,4 +1086,5 @@ O_FILES_SYM_ON := \
$(BUILD_DIR)/src/d/bg/d_bg_s_poly_pass_chk.o \
$(BUILD_DIR)/src/f_op/f_op_actor_mng.o \
$(BUILD_DIR)/src/d/map/d_map.o \
$(BUILD_DIR)/src/m_Do/m_Do_Reset.o \
rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp
+8 -8
View File
@@ -2128,7 +2128,7 @@ asm void daB_DS_c::mCreateTrap(bool param_0) {
// matches with literals
void daB_DS_c::mChangeVer2() {
if (mBitSw != 0xff) {
i_fopAcM_offSwitch(this, mBitSw);
fopAcM_offSwitch(this, mBitSw);
}
field_0x7ec = 0.0f;
shape_angle.x = 0;
@@ -4351,7 +4351,7 @@ asm void daB_DS_c::executeCircle() {
/* 805D02F8-805D0374 0051B8 007C+00 1/1 0/0 0/0 .text mBreakBoneSUB__8daB_DS_cFv */
void daB_DS_c::mBreakBoneSUB() {
if (mBitSw3 != 0xff) {
i_fopAcM_offSwitch(this, mBitSw3);
fopAcM_offSwitch(this, mBitSw3);
mSoundPos = current.pos;
mSound.startCollisionSE(Z2SE_HIT_SWORD, 0x1f);
}
@@ -5093,7 +5093,7 @@ void daB_DS_c::executeDamage() {
i_dComIfGp_event_reset();
if (mBitSw3 != 0xff) {
i_fopAcM_offSwitch(this, mBitSw3);
fopAcM_offSwitch(this, mBitSw3);
}
mBirthTrapTimerF = 0x1e;
shape_angle.y = current.angle.y = fopAcM_searchPlayerAngleY(this) + 0xc000;
@@ -5110,7 +5110,7 @@ void daB_DS_c::executeDamage() {
if (cLib_calcTimer(&mActionTimer) == 0 && field_0x7dc[mBackboneJoint] == 0.0f) {
if (mBitSw != 0xff) {
i_fopAcM_offSwitch(this, mBitSw);
fopAcM_offSwitch(this, mBitSw);
}
setBck(Ds_damage_id[mBackboneJoint], 0, 3.0f, 1.0f);
for (int i = 0; i < 4; i++) {
@@ -9981,7 +9981,7 @@ cPhs__Step daB_DS_c::create() {
field_0x7e8 = 0.0f;
field_0x7ec = 255.0f;
if (mBitSw != 0xff) {
i_fopAcM_offSwitch(this, mBitSw);
fopAcM_offSwitch(this, mBitSw);
}
attention_info.field_0x0[2] = 0;
attention_info.flags &= ~4;
@@ -9998,7 +9998,7 @@ cPhs__Step daB_DS_c::create() {
dComIfGs_onZoneSwitch(5, fopAcM_GetRoomNo(this));
}
if (mBitSw3 != 0xff) {
i_fopAcM_offSwitch(this, mBitSw3);
fopAcM_offSwitch(this, mBitSw3);
}
if (mAction != ACT_OPENING_DEMO) {
field_0x7f8 = 0.5f;
@@ -10254,7 +10254,7 @@ extern "C" asm void __dt__4cXyzFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::changeDemoPos0(cXyz const* param_0) {
extern "C" asm void changeDemoPos0__9daPy_py_cFPC4cXyz() {
nofralloc
#include "asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/changeDemoPos0__9daPy_py_cFPC4cXyz.s"
}
@@ -10275,7 +10275,7 @@ extern "C" asm void __as__4cXyzFRC4cXyz() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
extern "C" asm void changeDemoMode__9daPy_py_cFUliis() {
nofralloc
#include "asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/changeDemoMode__9daPy_py_cFUliis.s"
}
rel/d/a/b/d_a_b_go/d_a_b_go.cpp
+1 -1
View File
@@ -225,7 +225,7 @@ static int daB_GO_Execute(b_go_class* i_this) {
mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
mDoMtx_stack_c::YrotM(i_this->shape_angle.y);
mDoMtx_stack_c::scaleM(l_HIO.mSmallSize, l_HIO.mSmallSize, l_HIO.mSmallSize);
i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get());
i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
i_this->mpMorf->modelCalc();
rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp
+3 -3
View File
@@ -163,7 +163,7 @@ static void stick(b_gos_class* i_this) {
cLib_addCalc2(&i_this->speedF, 200, 1, 1);
J3DModel* boss_model = boss->mpMorf->getModel();
MTXCopy(boss_model->i_getAnmMtx(j_info[i_this->mJointIndex].joint_no & 0xFF), *calc_mtx);
MTXCopy(boss_model->getAnmMtx(j_info[i_this->mJointIndex].joint_no & 0xFF), *calc_mtx);
offset.x = 0.0f;
offset.y = 0.0f;
@@ -172,7 +172,7 @@ static void stick(b_gos_class* i_this) {
if (j_info[i_this->mJointIndex].field_0x4 < 1.0f) {
cXyz sp60;
MTXCopy(boss_model->i_getAnmMtx((j_info[i_this->mJointIndex].joint_no >> 8) & 0xFF),
MTXCopy(boss_model->getAnmMtx((j_info[i_this->mJointIndex].joint_no >> 8) & 0xFF),
*calc_mtx);
offset.x = 0.0f;
@@ -306,7 +306,7 @@ static int daB_GOS_Execute(b_gos_class* i_this) {
mDoMtx_stack_c::XrotM(i_this->shape_angle.x);
mDoMtx_stack_c::scaleM(l_HIO.mSize, l_HIO.mSize, l_HIO.mSize);
mDoMtx_stack_c::transM(0.0f, i_this->field_0x698, i_this->field_0x69c);
i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get());
i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
i_this->mpMorf->modelCalc();
rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp
+5 -5
View File
@@ -1861,7 +1861,7 @@ extern "C" asm void dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dEvt_control_c::checkSkipEdge() {
extern "C" asm void checkSkipEdge__14dEvt_control_cFv() {
nofralloc
#include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/checkSkipEdge__14dEvt_control_cFv.s"
}
@@ -2812,7 +2812,7 @@ static asm void func_8061A894() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::cancelOriginalDemo() {
extern "C" asm void cancelOriginalDemo__9daPy_py_cFv() {
nofralloc
#include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/cancelOriginalDemo__9daPy_py_cFv.s"
}
@@ -2822,7 +2822,7 @@ asm void daPy_py_c::cancelOriginalDemo() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void dComIfGp_event_reset() {
static asm void dComIfGp_event_reset__Fv() {
nofralloc
#include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/dComIfGp_event_reset__Fv.s"
}
@@ -2899,7 +2899,7 @@ extern "C" asm void __as__4cXyzFRC4cXyz() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
extern "C" asm void changeDemoMode__9daPy_py_cFUliis() {
nofralloc
#include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/changeDemoMode__9daPy_py_cFUliis.s"
}
@@ -2909,7 +2909,7 @@ asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 pa
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::changeOriginalDemo() {
extern "C" asm void changeOriginalDemo__9daPy_py_cFv() {
nofralloc
#include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/changeOriginalDemo__9daPy_py_cFv.s"
}
rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp
+9 -9
View File
@@ -264,14 +264,14 @@ static int nodeCallBack(J3DJoint* param_0, int param_1) {
b_oh_class* this_ = (b_oh_class*)model_p->getUserArea();
if (this_ != NULL && jnt_no >= this_->field_0xca8 && jnt_no <= 29) {
MTXCopy(model_p->i_getAnmMtx(jnt_no), *calc_mtx);
MTXCopy(model_p->getAnmMtx(jnt_no), *calc_mtx);
mDoMtx_YrotM(*calc_mtx, this_->field_0x61c[jnt_no].y + this_->field_0x784[jnt_no].y);
mDoMtx_ZrotM(*calc_mtx, this_->field_0x61c[jnt_no].x + this_->field_0x784[jnt_no].x);
MtxTrans(this_->mTentacleLength + -100.0f, 1.0f, 1.0f, 1);
MTXCopy(*calc_mtx, J3DSys::mCurrentMtx);
MtxScale(1.0f, this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no],
this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no], 1);
model_p->i_setAnmMtx(jnt_no, *calc_mtx);
model_p->setAnmMtx(jnt_no, *calc_mtx);
}
}
@@ -475,7 +475,7 @@ static void start(b_oh_class* i_this) {
case 1:
if (i_this->field_0xcac < -100.0f) {
for (int i = 0; i < 28; i++) {
MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i), mDoMtx_stack_c::get());
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(i), mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&sp28);
if (sp28.y > boss->field_0x47a0) {
@@ -761,7 +761,7 @@ static void attack(b_oh_class* i_this) {
if (i_this->mColliders[i].ChkCoHit()) {
cCcD_Obj* obj_p = i_this->mColliders[i].GetCoHitObj();
if (fopAcM_GetName(obj_p->GetAc()) == PROC_ALINK &&
!i_dComIfGp_event_runCheck())
!dComIfGp_event_runCheck())
{
if (!player_p->checkHookshotShootReturnMode() &&
boss->field_0x4744 == 0)
@@ -1074,7 +1074,7 @@ static void action(b_oh_class* i_this) {
cLib_addCalc2(&a_this->mTentacleLength, l_HIO.mLength, 0.1f, 0.5f);
}
MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(a_this->field_0x5c8 + 8),
MTXCopy(boss->mParts[0].field_0x0->getModel()->getAnmMtx(a_this->field_0x5c8 + 8),
mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&a_this->current.pos);
@@ -1197,10 +1197,10 @@ static void damage_check(b_oh_class* i_this) {
i_this->health = 1000;
cc_at_check(i_this, &i_this->mAtInfo);
MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i * 2 + 1),
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(i * 2 + 1),
mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&i_this->eyePos);
i_dComIfGp_setHitMark(1, i_this, &i_this->eyePos, NULL, NULL, 0);
dComIfGp_setHitMark(1, i_this, &i_this->eyePos, NULL, NULL, 0);
mDoAud_seStart(Z2SE_EN_OI_HIT_TENTACLE, &i_this->eyePos, 0, 0);
bvar = true;
@@ -1301,7 +1301,7 @@ static int daB_OH_Execute(b_oh_class* i_this) {
mDoMtx_stack_c::scaleM(l_HIO.mModelSize, l_HIO.mModelSize, l_HIO.mModelSize);
J3DModel* model_p = i_this->mpMorf->getModel();
model_p->i_setBaseTRMtx(mDoMtx_stack_c::get());
model_p->setBaseTRMtx(mDoMtx_stack_c::get());
i_this->mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)), 0);
i_this->mpBtk->play();
i_this->mpBrk->play();
@@ -1313,7 +1313,7 @@ static int daB_OH_Execute(b_oh_class* i_this) {
}
for (int i = 0; i < 15; i++) {
MTXCopy(model_p->i_getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get());
MTXCopy(model_p->getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&collider_center);
if (i_this->mAction >= ACTION_END) {
rel/d/a/b/d_a_b_oh/d_a_b_oh_NONMATCHING.cpp
+9 -9
View File
@@ -172,14 +172,14 @@ static int nodeCallBack(J3DJoint* param_0, int param_1) {
b_oh_class* this_ = (b_oh_class*)model_p->getUserArea();
if (this_ != NULL && jnt_no >= this_->field_0xca8 && jnt_no <= 29) {
MTXCopy(model_p->i_getAnmMtx(jnt_no), *calc_mtx);
MTXCopy(model_p->getAnmMtx(jnt_no), *calc_mtx);
mDoMtx_YrotM(*calc_mtx, this_->field_0x61c[jnt_no].y + this_->field_0x784[jnt_no].y);
mDoMtx_ZrotM(*calc_mtx, this_->field_0x61c[jnt_no].x + this_->field_0x784[jnt_no].x);
MtxTrans(this_->mTentacleLength + -100.0f, 1.0f, 1.0f, 1);
MTXCopy(*calc_mtx, J3DSys::mCurrentMtx);
MtxScale(1.0f, this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no],
this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no], 1);
model_p->i_setAnmMtx(jnt_no, *calc_mtx);
model_p->setAnmMtx(jnt_no, *calc_mtx);
}
}
@@ -328,7 +328,7 @@ static void start(b_oh_class* i_this) {
case 1:
if (i_this->field_0xcac < -100.0f) {
for (int i = 0; i < 28; i++) {
MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i), mDoMtx_stack_c::get());
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(i), mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&sp28);
if (sp28.y > boss->field_0x47a0) {
@@ -453,7 +453,7 @@ static void attack(b_oh_class* i_this) {
if (i_this->mColliders[i].ChkCoHit()) {
cCcD_Obj* obj_p = i_this->mColliders[i].GetCoHitObj();
if (fopAcM_GetName(obj_p->GetAc()) == PROC_ALINK &&
!i_dComIfGp_event_runCheck())
!dComIfGp_event_runCheck())
{
if (!player_p->checkHookshotShootReturnMode() &&
boss->field_0x4744 == 0)
@@ -716,7 +716,7 @@ static void action(b_oh_class* i_this) {
cLib_addCalc2(&a_this->mTentacleLength, l_HIO.mLength, 0.1f, 0.5f);
}
MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(a_this->field_0x5c8 + 8),
MTXCopy(boss->mParts[0].field_0x0->getModel()->getAnmMtx(a_this->field_0x5c8 + 8),
mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&a_this->current.pos);
@@ -768,9 +768,9 @@ static void damage_check(b_oh_class* i_this) {
i_this->health = 1000;
cc_at_check(i_this, &i_this->mAtInfo);
MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i * 2 + 1), mDoMtx_stack_c::get());
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(i * 2 + 1), mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&i_this->eyePos);
i_dComIfGp_setHitMark(1, i_this, &i_this->eyePos, NULL, NULL, 0);
dComIfGp_setHitMark(1, i_this, &i_this->eyePos, NULL, NULL, 0);
mDoAud_seStart(Z2SE_EN_OI_HIT_TENTACLE, &i_this->eyePos, 0, 0);
bvar = true;
@@ -851,7 +851,7 @@ static int daB_OH_Execute(b_oh_class* i_this) {
mDoMtx_stack_c::scaleM(l_HIO.mModelSize, l_HIO.mModelSize, l_HIO.mModelSize);
J3DModel* model_p = i_this->mpMorf->getModel();
model_p->i_setBaseTRMtx(mDoMtx_stack_c::get());
model_p->setBaseTRMtx(mDoMtx_stack_c::get());
i_this->mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)), 0);
i_this->mpBtk->play();
i_this->mpBrk->play();
@@ -863,7 +863,7 @@ static int daB_OH_Execute(b_oh_class* i_this) {
}
for (int i = 0; i < 15; i++) {
MTXCopy(model_p->i_getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get());
MTXCopy(model_p->getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&collider_center);
if (i_this->mAction >= ACTION_END) {
rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp
+3 -3
View File
@@ -141,10 +141,10 @@ static void action(b_oh2_class* i_this) {
break;
}
MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(i_this->field_0x5c8 + 8),
MTXCopy(boss->mParts[0].field_0x0->getModel()->getAnmMtx(i_this->field_0x5c8 + 8),
mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&i_this->current.pos);
MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(0), mDoMtx_stack_c::get());
MTXCopy(boss->mParts[0].field_0x0->getModel()->getAnmMtx(0), mDoMtx_stack_c::get());
local_20.set(0.0f, 0.0f, i_this->field_0x5c8 * 20.0f + 650.0f);
mDoMtx_stack_c::multVec(&local_20, &vstack_2C);
@@ -159,7 +159,7 @@ static void action(b_oh2_class* i_this) {
mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
mDoMtx_stack_c::YrotM(i_this->shape_angle.y);
mDoMtx_stack_c::XrotM(i_this->shape_angle.x);
i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get());
i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
int roomNo = fopAcM_GetRoomNo(i_this);
i_this->mpMorf->play(0, dComIfGp_getReverb(roomNo));
rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp
+2 -2
View File
@@ -44,7 +44,7 @@ static void zants_ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_
/* 80652B28-80652DA8 0001C8 0280+00 1/1 0/0 0/0 .text action__11daB_ZANTS_cFv */
void daB_ZANTS_c::action() {
daPy_py_c* player = daPy_getPlayerActorClass();
if (player->i_checkMagneBootsOn()) {
if (player->checkMagneBootsOn()) {
mSinkTimers[TIMER_PLAYER] = 3;
mPlayerID = fopAcM_GetID(player);
}
@@ -115,7 +115,7 @@ int daB_ZANTS_c::execute() {
mDoMtx_stack_c::YrotM(-mRotation.y);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::transM(0.0f, -30.0f, 0.0f);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
cMtx_copy(mDoMtx_stack_c::get(), mMtx);
if (mpBgW != NULL) {
rel/d/a/d_a_alldie/d_a_alldie.cpp
+4 -4
View File
@@ -73,7 +73,7 @@ int daAlldie_c::actionOrder() {
/* 804D59A0-804D5A44 000200 00A4+00 2/2 0/0 0/0 .text actionEvent__10daAlldie_cFv */
int daAlldie_c::actionEvent() {
if (dComIfGp_evmng_endCheck(mEventIdx)) {
i_dComIfGp_getEvent().reset();
dComIfGp_getEvent().reset();
if (mNextEventIdx != -1) {
mAction = ACT_NEXT;
@@ -98,7 +98,7 @@ int daAlldie_c::actionNext() {
if (map_evt != NULL) {
mMapToolID = map_evt->field_0x5;
mNextEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, mMapToolID);
mNextEventIdx = dComIfGp_getEventManager().getEventIdx(this, mMapToolID);
} else {
mMapToolID = -1;
}
@@ -178,14 +178,14 @@ int daAlldie_c::create() {
current.angle.z = 0;
current.angle.x = 0;
mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo());
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo());
mMapToolID = -1;
mNextEventIdx = -1;
dStage_MapEvent_dt_c* map_evt = dEvt_control_c::searchMapEventData(getEventNo(), roomNo);
if (map_evt != NULL) {
mMapToolID = map_evt->field_0x5;
mNextEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, mMapToolID);
mNextEventIdx = dComIfGp_getEventManager().getEventIdx(this, mMapToolID);
}
eventInfo.setEventId(mEventIdx);
rel/d/a/d_a_andsw/d_a_andsw.cpp
+2 -2
View File
@@ -29,13 +29,13 @@ int daAndsw_c::create() {
/* 80457A20-80457ABC 000120 009C+00 1/1 0/0 0/0 .text execute__9daAndsw_cFv */
int daAndsw_c::execute() {
if (i_fopAcM_isSwitch(this,mSwNo2)) {
if (fopAcM_isSwitch(this,mSwNo2)) {
if (0 < mTimer) {
mTimer--;
}
if (mTimer == 0) {
i_fopAcM_offSwitch(this,mSwNo);
fopAcM_offSwitch(this,mSwNo);
if (getType() == 1) {
fopAcM_delete(this);
rel/d/a/d_a_andsw2/d_a_andsw2.cpp
+7 -7
View File
@@ -152,7 +152,7 @@ int daAndsw2_c::create() {
setActio(ACT_ON_ALL_e);
}
mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo());
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo());
break;
case 1:
case 6:
@@ -164,7 +164,7 @@ int daAndsw2_c::create() {
setActio(ACT_ON_ALL_e);
}
mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo());
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo());
break;
case 2:
if (sw == 0xFF || dComIfGs_isSwitch(sw, fopAcM_GetRoomNo(this))) {
@@ -173,7 +173,7 @@ int daAndsw2_c::create() {
setActio(ACT_ON_ALL_e);
}
mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo());
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo());
break;
case 3:
if (sw == 0xFF || dComIfGs_isSwitch(sw, fopAcM_GetRoomNo(this))) {
@@ -182,14 +182,14 @@ int daAndsw2_c::create() {
setActio(ACT_ON_ALL_e);
}
mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo());
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo());
break;
case 4:
setActio(ACT_ON_ALL_e);
break;
case 5:
setActio(ACT_ON_ALL_e);
mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo());
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo());
break;
default:
setActio(ACT_WAIT_e);
@@ -288,7 +288,7 @@ static int daAndsw2_actionOrder(daAndsw2_c* i_this) {
i_this->setActio(daAndsw2_c::ACT_ON_ALL_e);
} else {
if (i_this->getType() == 5 &&
i_fopAcM_isSwitch(i_this, dLib_getEventSwitchNo(i_this->getEventNo())))
fopAcM_isSwitch(i_this, dLib_getEventSwitchNo(i_this->getEventNo())))
{
dComIfGs_onSwitch(i_this->getSwbit(), fopAcM_GetRoomNo(i_this));
i_this->setActio(daAndsw2_c::ACT_OFF_e);
@@ -321,7 +321,7 @@ static int daAndsw2_actionEvent(daAndsw2_c* i_this) {
i_this->setActio(daAndsw2_c::ACT_WAIT_e);
}
i_dComIfGp_event_reset();
dComIfGp_event_reset();
}
return 1;
rel/d/a/d_a_bg/d_a_bg.cpp
+2 -2
View File
@@ -829,7 +829,7 @@ int daBg_c::draw() {
field_0x5f0 = 0;
}
if (i_dComIfGs_isEventBit(dSv_event_flag_c::M_077)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::M_077)) {
field_0x5f0 = 9;
}
} else if (!memcmp(&name[3], "MA15", 4)) {
@@ -1050,7 +1050,7 @@ int daBg_c::create() {
if (model != NULL) {
mDoMtx_stack_c::transS(transX, 0.0f, transY);
mDoMtx_stack_c::YrotM(angle);
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
model->setBaseTRMtx(mDoMtx_stack_c::get());
J3DModelData* modelData = model->getModelData();
for (u16 j = 0; j < modelData->getMaterialNum(); j++) {
rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp
+12 -12
View File
@@ -516,7 +516,7 @@ void daBgObj_c::initBaseMtx() {
void daBgObj_c::setBaseMtx() {
for (int i = 0; i < 2; i++) {
if (field_0x5a8[field_0xcc8][i] != NULL) {
field_0x5a8[field_0xcc8][i]->i_setBaseTRMtx(mBgMtx);
field_0x5a8[field_0xcc8][i]->setBaseTRMtx(mBgMtx);
}
}
}
@@ -582,7 +582,7 @@ int daBgObj_c::CreateInitType0() {
/* 8045A160-8045A2B8 000B80 0158+00 3/0 0/0 0/0 .text CreateInitType1__9daBgObj_cFv */
int daBgObj_c::CreateInitType1() {
if (i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) {
if (fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) {
field_0xcc8 = 1;
release(mpBgW);
regist(mpBgW2);
@@ -611,7 +611,7 @@ int daBgObj_c::CreateInitType1() {
settingCullSizeBoxForCull(field_0xcc8);
mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, daBgObj_prm::getEvId(this));
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, daBgObj_prm::getEvId(this));
if (mpBgW2 != NULL) {
mpBgW2->Move();
@@ -1024,12 +1024,12 @@ BOOL daBgObj_c::checkDestroy() {
return false;
}
if (!i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) &&
if (!fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) &&
(daBgObj_prm::getSwBit2(this) == 0xFF ||
(i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) &&
(fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) &&
daBgObj_prm::getObjArg0(this) == 0xFF) ||
(daBgObj_prm::getSwBit2(this) != 0xFF &&
!i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) &&
!fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) &&
daBgObj_prm::getObjArg0(this) == 0)))
{
return true;
@@ -1242,7 +1242,7 @@ int daBgObj_c::actionOrderWait() {
orderWait_cyl();
break;
}
} else if (i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) {
} else if (fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) {
orderWait_spec();
field_0xd00 = 1;
}
@@ -1267,7 +1267,7 @@ int daBgObj_c::actionOrder() {
setAction(3);
}
if (!i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) || field_0xd00 != 0 ||
if (!fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) || field_0xd00 != 0 ||
field_0xcc8 == 0)
{
release(mpBgW);
@@ -1281,7 +1281,7 @@ int daBgObj_c::actionOrder() {
setAttentionInfo(attn_actor_p);
}
i_fopAcM_onSwitch(this, daBgObj_prm::getSwBit(this));
fopAcM_onSwitch(this, daBgObj_prm::getSwBit(this));
field_0xd00 = 0;
}
}
@@ -1303,7 +1303,7 @@ asm int daBgObj_c::actionOrder() {
int daBgObj_c::actionEvent() {
if (dComIfGp_evmng_endCheck(mEventIdx)) {
setAction(3);
i_dComIfGp_event_reset();
dComIfGp_event_reset();
}
return 1;
@@ -1321,7 +1321,7 @@ int daBgObj_c::ExecuteType0() {
if (swBit != 0xFF) {
if (arg0 == 0xFF) {
if (i_fopAcM_isSwitch(this, swBit)) {
if (fopAcM_isSwitch(this, swBit)) {
if (field_0xcc8 == 1) {
regist(mpBgW);
field_0xcc8 = 0;
@@ -1331,7 +1331,7 @@ int daBgObj_c::ExecuteType0() {
field_0xcc8 = 1;
}
} else if (arg0 == 0) {
if (i_fopAcM_isSwitch(this, swBit)) {
if (fopAcM_isSwitch(this, swBit)) {
if (field_0xcc8 == 0) {
release(mpBgW);
field_0xcc8 = 1;
rel/d/a/d_a_boomerang/d_a_boomerang.cpp
+2 -2
View File
@@ -916,7 +916,7 @@ int daBoomerang_c::draw() {
mSight.setSight(NULL, 5);
}
}
if (i_dComIfGp_event_runCheck() == 0) {
if (dComIfGp_event_runCheck() == 0) {
dComIfGd_set2DXlu((dDlst_base_c*)&mSight);
}
}
@@ -928,7 +928,7 @@ int daBoomerang_c::draw() {
g_env_light.setLightTevColorType_MAJI(field_0x56c, &tevStr);
mDoExt_modelEntryDL(field_0x56c);
daMirror_c::entry(field_0x56c);
} else if (i_dComIfGp_checkPlayerStatus0(0, 0x80000) != 0) {
} else if (dComIfGp_checkPlayerStatus0(0, 0x80000) != 0) {
g_env_light.setLightTevColorType_MAJI(field_0x590, &tevStr);
mDoExt_modelUpdateDL(field_0x590);
}
rel/d/a/d_a_crod/d_a_crod.cpp
+3 -3
View File
@@ -160,7 +160,7 @@ void daCrod_c::setRoomInfo() {}
void daCrod_c::setMatrix() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mpBallModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpBallModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 804A3500-804A3580 000740 0080+00 1/1 0/0 0/0 .text posMove__8daCrod_cFv */
@@ -287,12 +287,12 @@ int daCrod_c::execute() {
setReturn();
}
} else if (fopAcM_GetParam(this) == 0) {
if (i_dComIfGp_checkPlayerStatus0(0, 0x80)) {
if (dComIfGp_checkPlayerStatus0(0, 0x80)) {
fopAcM_SetParam(this, 1);
setBckAnm(ANM_WAIT_A_T_START);
}
} else if (fopAcM_GetParam(this) == 1) {
if (!i_dComIfGp_checkPlayerStatus0(0, 0x80)) {
if (!dComIfGp_checkPlayerStatus0(0, 0x80)) {
fopAcM_SetParam(this, 0);
setBckAnm(ANM_WAIT_A);
}
rel/d/a/d_a_disappear/d_a_disappear.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ static void set_disappear(disappear_class* i_this, f32 i_scale) {
dKy_Sound_set(i_this->current.pos, 120, fopAcM_GetID(i_this), 10);
i_fpcM_Search(s_ks_sub, i_this);
fpcM_Search(s_ks_sub, i_this);
if (i_this->field_0x567 == 3) {
fopAcM_seStart(i_this, JA_SE_CM_MONS_EXPLODE, 0);
rel/d/a/d_a_dmidna/d_a_dmidna.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ static int daDmidna_Delete(daDmidna_c* i_this) {
void daDmidna_c::setMatrix() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
model->setBaseTRMtx(mDoMtx_stack_c::get());
mpModelMorf->modelCalc();
}
rel/d/a/d_a_do/d_a_do.cpp
+5 -5
View File
@@ -443,7 +443,7 @@ static int nodeCallBack(J3DJoint* i_jntP, int param_1) {
do_class* user_area = (do_class*)model->getUserArea();
if (user_area) {
MTXCopy(model->i_getAnmMtx(joint_num), *calc_mtx);
MTXCopy(model->getAnmMtx(joint_num), *calc_mtx);
if (joint_num == 9 || joint_num == 10) {
cMtx_YrotM(*calc_mtx, user_area->field_0x60e.y + user_area->field_0x626.y);
@@ -715,7 +715,7 @@ static u32 search_food(do_class* i_this) {
target_bgc[i] = 0;
}
i_fpcM_Search((fpcLyIt_JudgeFunc)s_w_sub, i_this);
fpcM_Search((fpcLyIt_JudgeFunc)s_w_sub, i_this);
f32 tmp = FLOAT_LABEL(lit_3662);
if (target_info_count != 0) {
@@ -2448,7 +2448,7 @@ static void do_message(do_class* i_this) {
i_this->field_0x616 = 1;
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mAngleYFromPlayer, 2, 0x1000);
if (i_dComIfGp_event_runCheck() == 0 && i_this->mDistFromPlayer > FLOAT_LABEL(lit_3773)) {
if (dComIfGp_event_runCheck() == 0 && i_this->mDistFromPlayer > FLOAT_LABEL(lit_3773)) {
i_this->mAction = ACT_STAY;
i_this->mStayStatus = 0;
}
@@ -2990,12 +2990,12 @@ static void message(do_class* i_this) {
i_this->field_0x604 = 10;
if (i_this->mMsg.doFlow(i_this, 0, 0)) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
i_this->field_0xc06 = 0;
}
} else {
if (i_dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) {
i_this->mMsg.init(i_this, i_this->field_0xc08, 0, 0);
i_this->field_0xc06 = 1;
}
rel/d/a/d_a_dshutter/d_a_dshutter.cpp
+3 -3
View File
@@ -189,7 +189,7 @@ void daDsh_c::setMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
@@ -325,7 +325,7 @@ static daDsh_c::action_c l_openAction /* (&daDsh_c::initOpen, &daDsh_c::executeO
/* 804677E4-80467840 0003C4 005C+00 1/0 0/0 0/0 .text executeOpenWait__7daDsh_cFv */
int daDsh_c::executeOpenWait() {
if (i_fopAcM_isSwitch(this, mSw)) {
if (fopAcM_isSwitch(this, mSw)) {
setAction(&l_openAction);
}
@@ -400,7 +400,7 @@ static daDsh_c::action_c l_closeAction /* (&daDsh_c::initClose, &daDsh_c::execut
/* 80467A80-80467ADC 000660 005C+00 1/0 0/0 0/0 .text executeCloseWait__7daDsh_cFv */
int daDsh_c::executeCloseWait() {
if (!i_fopAcM_isSwitch(this, mSw)) {
if (!fopAcM_isSwitch(this, mSw)) {
setAction(&l_closeAction);
}
rel/d/a/d_a_econt/d_a_econt.cpp
+2 -2
View File
@@ -27,9 +27,9 @@ static void* s_rd_sub(void* i_this, void* param_1) {
/* 80519578-80519664 0000D8 00EC+00 1/1 0/0 0/0 .text rider_game__FP11econt_class */
static void rider_game(econt_class* i_this) {
if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && i_dComIfGp_event_runCheck() == 0) {
if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && dComIfGp_event_runCheck() == 0) {
data_805197E0[0] = 0;
i_fpcM_Search(s_rd_sub,i_this);
fpcM_Search(s_rd_sub,i_this);
if (i_this->field_0x5b4 == 0) {
if (i_this->field_0x5b8[0] == 0) {
rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ static void* s_sub(void* i_actorP, void* i_this) {
u8 daGuardMng_c::checkMerchantNum() {
field_0x56c = 1000000000.0f;
mMerchantNum = 0;
i_fpcM_Search(s_sub,this);
fpcM_Search(s_sub,this);
return mMerchantNum;
}
rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp
+21 -21
View File
@@ -196,7 +196,7 @@ static int Reel_CallBack(J3DJoint* param_0, int param_1) {
u16 uVar1 = param_0->getJntNo();
J3DModel* model = j3dSys.getModel();
s32 iVar2 = model->getUserArea();
MTXCopy(model->i_getAnmMtx(uVar1), (MtxP)calc_mtx);
MTXCopy(model->getAnmMtx(uVar1), (MtxP)calc_mtx);
cMtx_XrotM((MtxP)calc_mtx, (int)*(short*)(iVar2 + 0x58));
model->setAnmMtx(uVar1, (MtxP)calc_mtx);
PSMTXCopy((MtxP)calc_mtx, (MtxP) J3DSys::mCurrentMtx);
@@ -232,11 +232,11 @@ static int frog_CallBack(J3DJoint* param_0, int param_1) {
J3DModel* model = j3dSys.getModel();
model->getUserArea();
if (sVar2 == 1) {
MtxP uVar1 = model->i_getAnmMtx(sVar2);
MtxP uVar1 = model->getAnmMtx(sVar2);
MTXCopy(uVar1, (MtxP)calc_mtx);
cMtx_YrotM((MtxP)calc_mtx, -8800);
MtxScale(2.0f, 1.0f, 1.5f, 1);
model->i_setAnmMtx(sVar2, (MtxP)calc_mtx);
model->setAnmMtx(sVar2, (MtxP)calc_mtx);
MTXCopy((MtxP)calc_mtx, (MtxP)J3DSys::mCurrentMtx);
}
}
@@ -1587,7 +1587,7 @@ static int daFshop_Draw(fshop_class* param_0) {
if (param_0->field_0x4004 != NULL) {
mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f);
MtxP pfVar10 = mDoMtx_stack_c::get();
param_0->field_0x4004->i_setBaseTRMtx(pfVar10);
param_0->field_0x4004->setBaseTRMtx(pfVar10);
g_env_light.setLightTevColorType_MAJI(param_0->field_0x4004, &param_0->tevStr);
mDoExt_modelUpdateDL(param_0->field_0x4004);
}
@@ -1741,17 +1741,17 @@ static void lure_set(fshop_class* param_0) {
mDoMtx_stack_c::ZrotM(pLure->field_0x10);
mDoMtx_stack_c::scaleM(pLure->field_0x2c, pLure->field_0x2c, pLure->field_0x28);
mDoMtx_stack_c::transM(0.0f, 0.0f, 0.0f);
pLure->field_0x14->i_setBaseTRMtx(mDoMtx_stack_c::get());
pLure->field_0x14->setBaseTRMtx(mDoMtx_stack_c::get());
if (pLure->field_0x24 != 3) {
mDoMtx_stack_c::push();
mDoMtx_stack_c::transM(0.0f, hook_1_offy[pLure->field_0x24], 1.0f);
mDoMtx_stack_c::XrotM(-10000);
pLure->field_0x18[0]->i_setBaseTRMtx(mDoMtx_stack_c::get());
pLure->field_0x18[0]->setBaseTRMtx(mDoMtx_stack_c::get());
mDoMtx_stack_c::pop();
mDoMtx_stack_c::transM(0.0f, hook_2_offy[pLure->field_0x24],
hook_2_offz[pLure->field_0x24]);
mDoMtx_stack_c::XrotM(0x4000);
pLure->field_0x18[1]->i_setBaseTRMtx(mDoMtx_stack_c::get());
pLure->field_0x18[1]->setBaseTRMtx(mDoMtx_stack_c::get());
}
}
}
@@ -1816,7 +1816,7 @@ static void rod_set(fshop_class* param_0) {
}
mDoMtx_stack_c::XrotM(1300);
mDoMtx_stack_c::YrotM(0);
pRod->field_0x14->i_setBaseTRMtx(mDoMtx_stack_c::get());
pRod->field_0x14->setBaseTRMtx(mDoMtx_stack_c::get());
cXyz* local_64 = pRod->line_mat.getPos(0);
if (pRod->field_0x4c == 0) {
mDoMtx_stack_c::transM(0.0f, 15.0f, 0.0f);
@@ -1844,7 +1844,7 @@ static void rod_set(fshop_class* param_0) {
mDoMtx_stack_c::scaleM(guide_s[local_6c], guide_s[local_6c], guide_s[local_6c]);
mDoMtx_stack_c::transM(0.0f, 4.0f, 0.0f);
mDoMtx_stack_c::YrotM(0x4000);
pRod->field_0x18[local_6c]->i_setBaseTRMtx(mDoMtx_stack_c::get());
pRod->field_0x18[local_6c]->setBaseTRMtx(mDoMtx_stack_c::get());
}
}
}
@@ -1986,7 +1986,7 @@ static void tsubo_set(fshop_class* param_1) {
}
pTsubo->field_0x20 = cM_rndF(65536.0f);
pTsubo->field_0x22 = cM_rndF(65536.0f);
fopAc_ac_c* henna = i_fopAcM_SearchByName(PROC_NPC_HENNA);
fopAc_ac_c* henna = fopAcM_SearchByName(PROC_NPC_HENNA);
if (henna != NULL) {
// TODO: include henna header file
((u8*)henna)[0x7b5] = 0x3c;
@@ -2001,7 +2001,7 @@ static void tsubo_set(fshop_class* param_1) {
mDoMtx_stack_c::XrotM(xrot);
mDoMtx_stack_c::ZrotM(zrot);
mDoMtx_stack_c::scaleM(1.0f, 1.0f, 1.0f);
pTsubo->field_0x14->i_setBaseTRMtx(mDoMtx_stack_c::get());
pTsubo->field_0x14->setBaseTRMtx(mDoMtx_stack_c::get());
cLib_addCalc0(&pTsubo->field_0x1c, 1.0f, 50.0f);
}
}
@@ -2163,7 +2163,7 @@ static void koro2_mtx_set(fshop_class* param_1) {
mDoMtx_stack_c::scaleM(param_1->scale.x, param_1->scale.x, param_1->scale.x);
mDoMtx_stack_c::push();
mDoMtx_stack_c::scaleM(0.01f, 0.01f, 0.01f);
param_1->mpA_crwaku_model->i_setBaseTRMtx(mDoMtx_stack_c::get());
param_1->mpA_crwaku_model->setBaseTRMtx(mDoMtx_stack_c::get());
MTXCopy(mDoMtx_stack_c::get(), param_1->field_0x4030);
param_1->field_0x402c->Move();
mDoMtx_stack_c::pop();
@@ -2179,7 +2179,7 @@ static void koro2_mtx_set(fshop_class* param_1) {
param_1->mKoro2[iVar8].field_0x44.z);
mDoMtx_stack_c::push();
mDoMtx_stack_c::scaleM(0.01f, 0.01f, 0.01f);
param_1->mKoro2[iVar8].mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
param_1->mKoro2[iVar8].mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
MTXCopy(mDoMtx_stack_c::get(), param_1->mKoro2[iVar8].field_0x04);
param_1->mKoro2[iVar8].mpBgW->Move();
mDoMtx_stack_c::pop();
@@ -2388,12 +2388,12 @@ static void koro2_game(fshop_class* i_this) {
break;
}
i_this->field_0x4008 = (fshop_class*)i_fpcM_Search(s_sel_sub, i_this);
i_this->field_0x4008 = (fshop_class*)fpcM_Search(s_sel_sub, i_this);
if (i_this->field_0x4008 != NULL) {
stage_copy(i_this->field_0x4008, i_this);
i_this->field_0x4008->field_0x400d = 0;
fshop_class* ball_p = (fshop_class*)i_fpcM_Search(s_ball_sub, i_this);
fshop_class* ball_p = (fshop_class*)fpcM_Search(s_ball_sub, i_this);
if (ball_p != NULL) {
ball_p->field_0x4008 = i_this->field_0x4008;
}
@@ -2742,7 +2742,7 @@ static int daFshop_Execute(fshop_class* param_1) {
}
// TODO: include henna npc header
fopAc_ac_c* iVar9 = i_fopAcM_SearchByName(PROC_NPC_HENNA);
fopAc_ac_c* iVar9 = fopAcM_SearchByName(PROC_NPC_HENNA);
if (iVar9 != NULL && ((u8*)iVar9)[0x7b9] != 0 &&
(param_1->field_0x567 == 1 || dTimer_getRestTimeMs() == 0))
{
@@ -2770,7 +2770,7 @@ static int daFshop_Execute(fshop_class* param_1) {
local_cc = *(cXyz*)&BallEndPos - param_1->current.pos;
if (local_cc.abs() < 65.0f) {
// TODO: include henna npc header
fopAc_ac_c* uVar19 = i_fopAcM_SearchByName(PROC_NPC_HENNA);
fopAc_ac_c* uVar19 = fopAcM_SearchByName(PROC_NPC_HENNA);
if (uVar19 != NULL) {
BOOL bVar5 = FALSE;
for (int local_13c = 0; local_13c < 100; local_13c++) {
@@ -2851,7 +2851,7 @@ static int daFshop_Execute(fshop_class* param_1) {
local_cc = pmVar11->mLookat.mEye - param_1->current.pos;
mDoMtx_stack_c::YrotM(cM_atan2s(local_cc.x, local_cc.z));
mDoMtx_stack_c::XrotM(-cM_atan2s(local_cc.y, JMAFastSqrt((local_cc.x * local_cc.x + local_cc.z * local_cc.z))));
param_1->field_0x4070->i_setBaseTRMtx(mDoMtx_stack_c::get());
param_1->field_0x4070->setBaseTRMtx(mDoMtx_stack_c::get());
return 1;
} else {
lure_set(param_1);
@@ -2864,7 +2864,7 @@ static int daFshop_Execute(fshop_class* param_1) {
for (s32 local_150 = 0; local_150 < 15; local_150++, local_148++) {
*local_148 = pWeed[local_14c].field_0x00[local_150];
}
i_fpcM_Search(s_fish_sub, &pWeed[local_14c]);
fpcM_Search(s_fish_sub, &pWeed[local_14c]);
}
cXyz cStack_f0(-720.0f, 30.0f, 70.0f);
cXyz cStack_fc(0.5f, 0.5f, 0.5f);
@@ -2887,7 +2887,7 @@ static int daFshop_Execute(fshop_class* param_1) {
mDoMtx_stack_c::transS(-450.0f, 25.0f, -250.0f);
mDoMtx_stack_c::YrotM(0x4000);
mDoMtx_stack_c::ZrotM(iVar6 + 2000);
param_1->field_0x6b30->i_setBaseTRMtx(mDoMtx_stack_c::get());
param_1->field_0x6b30->setBaseTRMtx(mDoMtx_stack_c::get());
mDoMtx_stack_c::transS(-450.0f, 0.0f, -250.0f);
mDoMtx_stack_c::scaleM(4.0f, 1.5f, 1.0f);
MTXCopy(mDoMtx_stack_c::get(), param_1->field_0x6b38);
@@ -2912,7 +2912,7 @@ static int daFshop_Execute(fshop_class* param_1) {
mDoMtx_stack_c::XrotM(iVar10);
mDoMtx_stack_c::ZrotM(iVar11);
mDoMtx_stack_c::transM(-10.0f, -7.0f, 65.0f);
param_1->field_0x3ff4->i_setBaseTRMtx(mDoMtx_stack_c::get());
param_1->field_0x3ff4->setBaseTRMtx(mDoMtx_stack_c::get());
koro2_game(param_1);
}
return 1;
rel/d/a/d_a_mirror/d_a_mirror.cpp
+3 -3
View File
@@ -205,7 +205,7 @@ void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) {
return;
}
dScnKy_env_light_c* kankyo = i_dKy_getEnvlight();
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
JUT_ASSERT(kankyo != 0);
GXColor color = {0};
@@ -477,7 +477,7 @@ void daMirror_c::setModelMtx() {
mDoMtx_stack_c::YrotM(shape_angle.y);
mDoMtx_stack_c::XrotM(shape_angle.x);
mDoMtx_stack_c::ZrotM(0x2000);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80872018-8087206C 0014D8 0054+00 1/0 0/0 0/0 .text daMirror_create__FP10daMirror_c */
@@ -488,7 +488,7 @@ static int daMirror_create(daMirror_c* i_this) {
/* 8087206C-80872344 00152C 02D8+00 2/2 0/0 0/0 .text create__10daMirror_cFv */
int daMirror_c::create() {
if (getSw() != 0xFF && !i_fopAcM_isSwitch(this, getSw())) {
if (getSw() != 0xFF && !fopAcM_isSwitch(this, getSw())) {
return cPhs_COMPLEATE_e;
}
rel/d/a/d_a_movie_player/d_a_movie_player.cpp
+1 -1
View File
@@ -1882,7 +1882,7 @@ static asm void daMP_ActivePlayer_Finish() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void JKRFree(void* param_0) {
extern "C" asm void JKRFree__FPv() {
nofralloc
#include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/JKRFree__FPv.s"
}
rel/d/a/d_a_myna/d_a_myna.cpp
+26 -26
View File
@@ -1458,7 +1458,7 @@ int daMyna_c::execute() {
setItemInfo();
int iVar1 = chkEvent();
if (daMyna_LightActor == NULL) {
i_fpcM_Search(daMyna_searchLight, this);
fpcM_Search(daMyna_searchLight, this);
}
setRoomNo();
attention_info.position.set(current.pos.x, current.pos.y + 40.0f, current.pos.z);
@@ -1563,7 +1563,7 @@ asm int daMyna_c::createHeap() {
/* 8094686C-809468EC 000CEC 0080+00 1/1 0/0 0/0 .text jntNodeCB__8daMyna_cFP8J3DJointP8J3DModel */
int daMyna_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) {
u16 jntNo = i_jnt->getJntNo();
mDoMtx_stack_c::copy(i_model->i_getAnmMtx(jntNo));
mDoMtx_stack_c::copy(i_model->getAnmMtx(jntNo));
i_model->setAnmMtx(jntNo, mDoMtx_stack_c::get());
cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
return 1;
@@ -1655,7 +1655,7 @@ asm void daMyna_c::attack_before_talk_init() {
/* 80946B40-80946BB4 000FC0 0074+00 1/0 0/0 0/0 .text attack_before_talk_move__8daMyna_cFv */
void daMyna_c::attack_before_talk_move() {
if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
onEventFlag(1);
field_0x92C = 2;
}
@@ -1764,7 +1764,7 @@ void daMyna_c::attack_after_talk_init() {
*/
void daMyna_c::attack_after_talk_move() {
if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
onEventFlag(2);
field_0x91C = 0x139;
field_0x92C = 5;
@@ -1884,8 +1884,8 @@ asm void daMyna_c::greet_talk_init() {
/* 8094711C-809471BC 00159C 00A0+00 1/0 0/0 0/0 .text greet_talk_move__8daMyna_cFv */
void daMyna_c::greet_talk_move() {
if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
i_dComIfGp_event_reset();
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
dComIfGp_event_reset();
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
field_0x937 = 20;
field_0x92C = 19;
} else {
@@ -1921,7 +1921,7 @@ COMPILER_STRIP_GATE(0x8094B204, &lit_4655);
#ifdef NONMATCHING
void daMyna_c::shopping_wait_move() {
if (!daPy_py_c::i_checkNowWolf()) {
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
field_0x92C = 17;
field_0x937 = 20;
} else {
@@ -1960,7 +1960,7 @@ void daMyna_c::shopping_wait_move() {
}
}
if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203]) &&
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203]) &&
daMyna_evtTagActor1 != NULL)
{
cXyz stack_2c(1.0f, 1.0f, 1.0f);
@@ -2031,7 +2031,7 @@ void daMyna_c::shopping_talk_init() {
/* 80947630-809476A0 001AB0 0070+00 1/0 0/0 0/0 .text shopping_talk_move__8daMyna_cFv */
void daMyna_c::shopping_talk_move() {
if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
field_0x828 = NULL;
field_0x92C = 7;
}
@@ -2054,7 +2054,7 @@ void daMyna_c::thanks_talk_init() {
/* 8094772C-80947794 001BAC 0068+00 1/0 0/0 0/0 .text thanks_talk_move__8daMyna_cFv */
void daMyna_c::thanks_talk_move() {
if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
field_0x92C = 7;
}
}
@@ -2112,8 +2112,8 @@ void daMyna_c::byebye_talk_move() {
bVar1 = false;
}
i_dComIfGp_event_reset();
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
dComIfGp_event_reset();
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
field_0x92C = 0x11;
field_0x937 = 0x14;
} else if (bVar1) {
@@ -2384,7 +2384,7 @@ void daMyna_c::wolf_talk_init() {
/* 80948118-80948174 002598 005C+00 1/0 0/0 0/0 .text wolf_talk_move__8daMyna_cFv */
void daMyna_c::wolf_talk_move() {
if (mMsgFlow.doFlow(this, NULL, 0) != 0) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
field_0x92C = field_0x92E;
}
}
@@ -2424,7 +2424,7 @@ void daMyna_c::attack_wait2_move() {
if (daMyna_evtTagActor0 != NULL) {
cXyz stack_1c(1.0f, 1.0f, 1.0f);
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
if (chkPlayerInEvtArea(daMyna_evtTagActor0, stack_1c)) {
field_0x937 = 20;
field_0x92C = 19;
@@ -2478,7 +2478,7 @@ asm void daMyna_c::attack_before_talk2_init() {
/* 809483DC-80948444 00285C 0068+00 1/0 0/0 0/0 .text attack_before_talk2_move__8daMyna_cFv */
void daMyna_c::attack_before_talk2_move() {
if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
field_0x92C = 19;
}
}
@@ -2577,7 +2577,7 @@ void daMyna_c::attack2_move() {
mSph.OffAtVsPlayerBit();
if (field_0x937 != 0) {
field_0x937--;
if (i_dComIfGs_getLife() <= 1) {
if (dComIfGs_getLife() <= 1) {
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[802]);
field_0x937 = 0;
}
@@ -2604,7 +2604,7 @@ void daMyna_c::attack2_talk_init() {
/* 80948734-809487EC 002BB4 00B8+00 1/0 0/0 0/0 .text attack2_talk_move__8daMyna_cFv */
void daMyna_c::attack2_talk_move() {
if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
field_0x828 = NULL;
field_0x92C = 7;
dMsgObject_setTotalPayment(0);
@@ -2816,7 +2816,7 @@ asm void daMyna_c::talkAnime(msg_class* param_0) {
int daMyna_c::chkEvent() {
int retVal = 1;
if (daPy_py_c::i_checkNowWolf()) {
if (!i_dComIfGp_getEvent().i_isOrderOK()) {
if (!dComIfGp_getEvent().isOrderOK()) {
retVal = 0;
if (eventInfo.checkCommandTalk()) {
if (field_0x92C == 0x10) {
@@ -2948,7 +2948,7 @@ void daMyna_c::initiate() {
field_0x920 = 0;
field_0x922 = 0;
if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
field_0x932 = 0;
field_0x938 = 0;
} else {
@@ -3002,10 +3002,10 @@ asm void daMyna_c::initiate() {
void daMyna_c::setItemInfo() {
if (daMyna_actor_count != -1 && mNumShopItems > daMyna_actor_count) {
daMyna_actor_count = 0;
i_fpcM_Search(daMyna_searchSSItem, this);
fpcM_Search(daMyna_searchSSItem, this);
}
if (daMyna_evtTagActor0 == NULL) {
i_fpcM_Search(daMyna_searchEvtTag, this);
fpcM_Search(daMyna_searchEvtTag, this);
}
if (daMyna_actor_count != -1 && mNumShopItems <= daMyna_actor_count) {
for (int i = 0; i < mNumShopItems; i++) {
@@ -3058,13 +3058,13 @@ void daMyna_c::set_mtx() {
mDoMtx_stack_c::transS(local_18);
mDoMtx_stack_c::ZXYrotM(current.angle);
mDoMtx_stack_c::scaleM(scale);
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
model->setBaseTRMtx(mDoMtx_stack_c::get());
mpMorf->modelCalc();
mDoMtx_stack_c::copy(mpMorf->getModel()->i_getAnmMtx(4));
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&field_0x82C);
mDoMtx_stack_c::copy(mpMorf->getModel()->i_getAnmMtx(4));
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&field_0x838);
mDoMtx_stack_c::copy(mpMorf->getModel()->i_getAnmMtx(0x10));
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x10));
mDoMtx_stack_c::multVecZero(&field_0x85C);
field_0x82C -= current.pos;
field_0x838 -= current.pos;
@@ -3337,7 +3337,7 @@ void daMyna_c::checkDead() {
if (daMyna_evtTagActor0 == NULL ||
(daMyna_evtTagActor0 != NULL && !chkPlayerInEvtArea(daMyna_evtTagActor0, var1)))
{
if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203])) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203])) {
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[203]);
}
}
rel/d/a/d_a_ni/d_a_ni_NONMATCHING.cpp
+25 -25
View File
@@ -434,7 +434,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
J3DModel* model = j3dSys.getModel();
ni_class* a_this = (ni_class*)model->getUserArea();
if (a_this != NULL) {
MTXCopy(model->i_getAnmMtx(joint_no), *calc_mtx);
MTXCopy(model->getAnmMtx(joint_no), *calc_mtx);
if (joint_no == JNT_HEAD) {
cMtx_YrotM(*calc_mtx, a_this->field_0x61c);
cMtx_XrotM(*calc_mtx, a_this->field_0x61a);
@@ -449,26 +449,26 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
cMtx_ZrotM(*calc_mtx, a_this->field_0x9ee[joint_no - 1]);
}
model->i_setAnmMtx(joint_no, *calc_mtx);
model->setAnmMtx(joint_no, *calc_mtx);
MTXCopy(*calc_mtx, j3dSys.mCurrentMtx);
if (joint_no == TREG_S(0)) {
MTXCopy(model->i_getAnmMtx(joint_no), *calc_mtx);
MTXCopy(model->getAnmMtx(joint_no), *calc_mtx);
cMtx_YrotM(*calc_mtx, TREG_S(1));
cMtx_XrotM(*calc_mtx, TREG_S(2));
cMtx_ZrotM(*calc_mtx, TREG_S(3));
model->i_setAnmMtx(joint_no, *calc_mtx);
model->setAnmMtx(joint_no, *calc_mtx);
MTXCopy(*calc_mtx, j3dSys.mCurrentMtx);
}
if (joint_no == TREG_S(4)) {
MTXCopy(model->i_getAnmMtx(joint_no), *calc_mtx);
MTXCopy(model->getAnmMtx(joint_no), *calc_mtx);
cMtx_YrotM(*calc_mtx, TREG_S(5));
cMtx_XrotM(*calc_mtx, TREG_S(6));
cMtx_ZrotM(*calc_mtx, TREG_S(7));
model->i_setAnmMtx(joint_no, *calc_mtx);
model->setAnmMtx(joint_no, *calc_mtx);
MTXCopy(*calc_mtx, j3dSys.mCurrentMtx);
}
}
@@ -554,8 +554,8 @@ static void damage_check(ni_class* i_this) {
if (i_this->mAtInfo.mHitType == 1 && i_this->health <= 0) {
i_this->health = 0;
if (!i_dComIfGp_event_runCheck() &&
i_fpcM_Search(s_play_sub, i_this) == NULL)
if (!dComIfGp_event_runCheck() &&
fpcM_Search(s_play_sub, i_this) == NULL)
{
i_this->mAction = ACTION_PLAY_e;
i_this->mMode = 0;
@@ -693,7 +693,7 @@ static fopAc_ac_c* search_test(ni_class* i_this) {
target_info[i] = NULL;
}
i_fpcM_Search(s_t_sub, i_this);
fpcM_Search(s_t_sub, i_this);
f32 search_range = 100.0f;
if (target_info_count != 0) {
@@ -822,7 +822,7 @@ static void ni_normal(ni_class* i_this) {
i_this->field_0x60e = 1;
}
if (i_dComIfGp_checkPlayerStatus0(0, 0x8000000)) {
if (dComIfGp_checkPlayerStatus0(0, 0x8000000)) {
i_this->field_0x60e = 30;
}
@@ -847,7 +847,7 @@ static void ni_normal(ni_class* i_this) {
}
}
fopAc_ac_c* cow = i_fopAcM_SearchByName(PROC_COW);
fopAc_ac_c* cow = fopAcM_SearchByName(PROC_COW);
if (cow != NULL && cow->speedF > 1.0f) {
sp50 = cow->current.pos - a_this->current.pos;
f32 var_f30 = sp50.abs();
@@ -1244,7 +1244,7 @@ static void* s_b_sub(void* i_actor, void* i_data) {
/* 8094DD74-8094DED0 002234 015C+00 1/1 0/0 0/0 .text ni_windspin__FP8ni_class */
static void ni_windspin(ni_class* i_this) {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
fopAc_ac_c* boomerang = (fopAc_ac_c*)i_fpcM_Search(s_b_sub, i_this);
fopAc_ac_c* boomerang = (fopAc_ac_c*)fpcM_Search(s_b_sub, i_this);
switch (i_this->mMode) {
case 0:
@@ -1284,7 +1284,7 @@ static void ni_windspin(ni_class* i_this) {
class daNpcMoiR_c : public fopAc_ac_c {
public:
MtxP getHandRMtx() { return mpMorf->getModel()->i_getAnmMtx(0x11); }
MtxP getHandRMtx() { return mpMorf->getModel()->getAnmMtx(0x11); }
/* 0x568 */ mDoExt_McaMorfSO* mpMorf;
};
@@ -1293,7 +1293,7 @@ public:
static int ni_demo0(ni_class* i_this) {
cXyz sp28;
cXyz sp34;
daNpcMoiR_c* moi = (daNpcMoiR_c*)i_fopAcM_SearchByName(PROC_NPC_MOIR);
daNpcMoiR_c* moi = (daNpcMoiR_c*)fopAcM_SearchByName(PROC_NPC_MOIR);
if (i_this->mTimers[0] == 0 && moi != NULL) {
mDoMtx_stack_c::copy(moi->getHandRMtx());
@@ -1378,7 +1378,7 @@ static void ni_message(ni_class* i_this) {
cLib_addCalc0(&i_this->speedF, 1.0f, 2.0f);
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mAngleToPlayer, 2, 0x1000);
if (!i_dComIfGp_event_runCheck() && i_this->mDistToPlayer > 400.0f) {
if (!dComIfGp_event_runCheck() && i_this->mDistToPlayer > 400.0f) {
i_this->mAction = ACTION_NORMAL_e;
i_this->mMode = 0;
}
@@ -1649,7 +1649,7 @@ static int ni_play(ni_class* i_this) {
static void play_camera(ni_class* i_this) {
fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; // necessary for reg alloc
camera_class* camera = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0));
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_class* camera0 = (camera_class*)dComIfGp_getCamera(0);
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
cXyz sp1D8;
@@ -1687,8 +1687,8 @@ static void play_camera(ni_class* i_this) {
i_this->field_0xad4 = camera0->mLookat.mCenter;
i_this->field_0xaec = dComIfGd_getView()->mFovy;
player->i_changeOriginalDemo();
player->i_changeDemoMode(1, 1, 0, 0);
player->changeOriginalDemo();
player->changeDemoMode(1, 1, 0, 0);
mDoGph_gInf_c::fadeOut(0.1f, g_blackColor);
// fallthrough
@@ -1803,9 +1803,9 @@ static void play_camera(ni_class* i_this) {
camera->mCamera.Reset(i_this->field_0xad4, i_this->field_0xac8, i_this->field_0xaec, 0);
camera->mCamera.Start();
camera->mCamera.SetTrimSize(0);
i_dComIfGp_event_reset();
dComIfGp_event_reset();
player->i_cancelOriginalDemo();
player->cancelOriginalDemo();
i_this->mPlayCamMode = 0;
i_this->mAction = ACTION_NORMAL_e;
@@ -2197,13 +2197,13 @@ static int message(ni_class* i_this) {
i_this->field_0x60c = 10;
if (i_this->mMsgFlow.doFlow(i_this, NULL, 0)) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
i_this->field_0xa52 = 0;
}
return 1;
}
if (i_dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) {
i_this->mMsgFlow.init(i_this, i_this->mFlowNo, 0, NULL);
i_this->field_0xa52 = 1;
OS_REPORT("////////NI MSG FNO %d\n", i_this->mFlowNo);
@@ -2263,14 +2263,14 @@ static int daNi_Execute(ni_class* i_this) {
mDoMtx_stack_c::YrotM(i_this->shape_angle.y + i_this->field_0x9ec);
mDoMtx_stack_c::ZrotM(i_this->shape_angle.z);
mDoMtx_stack_c::scaleM(l_HIO.mBaseSize, l_HIO.mBaseSize, l_HIO.mBaseSize);
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
model->setBaseTRMtx(mDoMtx_stack_c::get());
}
i_this->mpMorf->play(&i_this->eyePos, 0, 0);
i_this->mpBtk->setFrame(i_this->mColor);
i_this->mpMorf->modelCalc();
MTXCopy(model->i_getAnmMtx(5), *calc_mtx);
MTXCopy(model->getAnmMtx(5), *calc_mtx);
MtxPosition(&sp30, &i_this->eyePos);
i_this->attention_info.position = i_this->eyePos;
i_this->attention_info.position.y += 30.0f;
@@ -2463,7 +2463,7 @@ static int daNi_Create(fopAc_ac_c* i_this) {
}
if (strcmp(dComIfGp_getStartStageName(), "F_SP108") == 0 &&
!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[528]))
!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[528]))
{
a_this->mAction = ACTION_DEMO0_e;
a_this->mTimers[0] = 10;
rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp
+5 -5
View File
@@ -42,22 +42,22 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
/* 80485838-80485974 000078 013C+00 1/1 0/0 0/0 .text checkWork__8daScex_cFv */
int daScex_c::checkWork() {
if (getArg1() == 0xFF || getArg1() == 0 || getArg1() == 3) {
if (i_fopAcM_isSwitch(this, getSwNo())) {
if (fopAcM_isSwitch(this, getSwNo())) {
return 0;
}
} else if ((getArg1() == 1 || getArg1() == 2 || getArg1() == 4) && getSwNo() != 0xFF) {
if (!i_fopAcM_isSwitch(this, getSwNo())) {
if (!fopAcM_isSwitch(this, getSwNo())) {
return 0;
}
}
u16 offBit = getOffEventBit();
if (offBit != 0x0FFF && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[offBit])) {
if (offBit != 0x0FFF && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[offBit])) {
return 0;
}
u16 onBit = getOnEventBit();
if (onBit != 0x0FFF && !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[onBit])) {
if (onBit != 0x0FFF && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[onBit])) {
return 0;
}
@@ -175,7 +175,7 @@ int daScex_c::execute() {
if (getArg1() == 0xFF || getArg1() == 0 || getArg1() == 3) {
if (getSwNo() != 0xFF) {
i_fopAcM_onSwitch(this, getSwNo());
fopAcM_onSwitch(this, getSwNo());
}
}
}
rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ int daScExit_c::Create() {
mToolID = 0xFF;
eventInfo.setArchiveName(l_arcName);
mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xFF);
mEventID = dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xFF);
return 1;
}
@@ -109,7 +109,7 @@ void daScExit_c::actionOrderEvent() {
void daScExit_c::actionEvent() {
if (dComIfGp_evmng_endCheck(mEventID)) {
setAction(ACTION_DEAD_e);
i_dComIfGp_event_reset();
dComIfGp_event_reset();
} else {
demoProc();
dComIfGp_setPlayerStatus1(0, 0x4000000);
rel/d/a/d_a_shop_item/d_a_shop_item.cpp
+1 -1
View File
@@ -160,7 +160,7 @@ void daShopItem_c::set_mtx() {
mDoMtx_stack_c::XrotM(mData[mShopItemID].get_angleOffsetX());
}
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 8059EEF4-8059EF48 0005B4 0054+00 1/1 0/0 0/0 .text _execute__12daShopItem_cFv */
rel/d/a/d_a_swTime/d_a_swTime.cpp
+2 -2
View File
@@ -27,12 +27,12 @@ int daSwTime_c::create() {
/* 80D4F6C8-80D4F758 000108 0090+00 1/1 0/0 0/0 .text execute__10daSwTime_cFv */
int daSwTime_c::execute() {
if (mSwbit2 != 0xFF && !i_fopAcM_isSwitch(this,mSwbit2)) {
if (mSwbit2 != 0xFF && !fopAcM_isSwitch(this,mSwbit2)) {
return 1;
}
if (dKy_getdaytime_hour() == mTime && dKy_getdaytime_minute() == 0) {
i_fopAcM_onSwitch(this,mSwbit);
fopAcM_onSwitch(this,mSwbit);
}
return 1;
rel/d/a/d_a_swc00/d_a_swc00.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ static bool hitCheck(daSwc00_c* i_swc) {
fopAc_ac_c* player;
if (daSwc00_getCondition(i_swc) == 2) {
player = (fopAc_ac_c*)i_dComIfGp_getHorseActor();
player = (fopAc_ac_c*)dComIfGp_getHorseActor();
} else {
player = playerAc;
}
rel/d/a/d_a_tbox/d_a_tbox_NONMATCHING.cpp
+27 -27
View File
@@ -153,9 +153,9 @@ cPhs__Step daTbox_c::commonShapeSet() {
mpModel->setBaseScale(scale);
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(home.angle.y);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
if (mpEffectModel != NULL) {
mpEffectModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpEffectModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
return cPhs_COMPLEATE_e;
@@ -374,11 +374,11 @@ void daTbox_c::CreateInit() {
}
mTboxNo = getTboxNo();
mEventId = i_dComIfGp_getEventManager().getEventIdx(this, getEvent());
mEventId = dComIfGp_getEventManager().getEventIdx(this, getEvent());
if (getShapeType() == SHAPE_BOSSKEY) {
eventInfo.setArchiveName(getModelInfo()->mArcName);
field_0x984 = i_dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_TREASURE_BOSS", 0xff);
field_0x984 = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_TREASURE_BOSS", 0xff);
}
initBaseMtx();
@@ -445,7 +445,7 @@ void daTbox_c::initAnm() {
if (func_type == 6 && !checkDrop()) {
setAction(&actionDropWait);
} else if (func_type == 3) {
if (i_fopAcM_isSwitch(this, getSwNo())) {
if (fopAcM_isSwitch(this, getSwNo())) {
cXyz pos = current.pos;
if (fopAcM_gc_c::gndCheck(&pos)) {
current.pos.y = fopAcM_gc_c::getGroundY();
@@ -664,7 +664,7 @@ int daTbox_c::getDir() {
u16 bit = 1;
u16 dir = 0;
for (int i = 0; i < 4; i++) {
if (i_fopAcM_isSwitch(this, getSwNo() + i)) {
if (fopAcM_isSwitch(this, getSwNo() + i)) {
dir += bit;
}
bit = bit << 1;
@@ -917,7 +917,7 @@ int daTbox_c::actionDemo() {
} else {
setAction(&actionWait);
}
i_dComIfGp_event_reset();
dComIfGp_event_reset();
dKy_set_allcol_ratio(1.0f);
flagOff(0x18);
dComIfGp_event_setItemPartner(NULL);
@@ -927,10 +927,10 @@ int daTbox_c::actionDemo() {
if (fopAcM_GetRoomNo(this) == 0) {
switch (getTboxNo()) {
case 3:
dComIfGs_setEventReg(0xedff, i_dComIfGs_getEventReg(0xedff) | 0x40);
dComIfGs_setEventReg(0xedff, dComIfGs_getEventReg(0xedff) | 0x40);
break;
case 2:
dComIfGs_setEventReg(0xebff, i_dComIfGs_getEventReg(0xebff) | 0x10);
dComIfGs_setEventReg(0xebff, dComIfGs_getEventReg(0xebff) | 0x10);
break;
default:
OSReport_Error("ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n");
@@ -939,7 +939,7 @@ int daTbox_c::actionDemo() {
} else if (fopAcM_GetRoomNo(this) == 3) {
switch (getTboxNo()) {
case 5:
dComIfGs_setEventReg(0xf0ff, i_dComIfGs_getEventReg(0xf0ff) | 0x80);
dComIfGs_setEventReg(0xf0ff, dComIfGs_getEventReg(0xf0ff) | 0x80);
break;
default:
OSReport_Error("ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n");
@@ -948,7 +948,7 @@ int daTbox_c::actionDemo() {
}
} else if (!strcmp(dComIfGp_getStartStageName(), "F_SP109")) {
if (fopAcM_GetRoomNo(this) == 0 && getTboxNo() == 0x15) {
dComIfGs_setEventReg(0xefff, i_dComIfGs_getEventReg(0xefff) | 0x10);
dComIfGs_setEventReg(0xefff, dComIfGs_getEventReg(0xefff) | 0x10);
}
}
}
@@ -964,7 +964,7 @@ int daTbox_c::actionDemo2() {
if ((getEvent() == 0xff && dComIfGp_evmng_endCheck("DEFAULT_TREASURE_APPEAR")) ||
(getEvent() != 0xff && dComIfGp_evmng_endCheck(mEventId))) {
setAction(&actionOpenWait);
i_dComIfGp_event_reset();
dComIfGp_event_reset();
} else {
demoProc();
}
@@ -976,11 +976,11 @@ int daTbox_c::actionDropDemo() {
if (mEventId != -1) {
if (dComIfGp_evmng_endCheck(mEventId)) {
setAction(&actionOpenWait);
i_dComIfGp_event_reset();
dComIfGp_event_reset();
setDzb();
home.pos = current.pos;
if (field_0x9c9 != 0) {
camera_class* camera = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0));
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera->mCamera.Start();
camera->mCamera.SetTrimSize(0);
field_0x9c9 = 0;
@@ -1260,14 +1260,14 @@ int daTbox_c::actionOpenWait() {
if (getShapeType() != SHAPE_SMALL && player->i_checkNowWolf() &&
!midna->checkMetamorphoseEnable()) {
setAction(&actionNotOpenDemo);
mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
demoProc();
field_0x9f4 = 0;
} else {
field_0x718 = player->checkTreasureRupeeReturn(getItemNo());
setGetDemoItem();
setAction(&actionDemo);
mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
demoProc();
field_0x9f4 = 0;
}
@@ -1292,7 +1292,7 @@ int daTbox_c::actionOpenWait() {
int daTbox_c::actionNotOpenDemo() {
if (dComIfGp_evmng_endCheck(mEventId)) {
setAction(&actionOpenWait);
i_dComIfGp_event_reset();
dComIfGp_event_reset();
} else {
demoProc();
}
@@ -1307,7 +1307,7 @@ int daTbox_c::checkDrop() {
}
} else if (getSwType() == 0) {
for (int i = 0; i < 4; i++) {
if (i_fopAcM_isSwitch(this, getSwNo() + i)) {
if (fopAcM_isSwitch(this, getSwNo() + i)) {
return true;
}
}
@@ -1319,7 +1319,7 @@ int daTbox_c::checkDrop() {
*/
// nonmatching (regalloc)
void daTbox_c::settingDropDemoCamera() {
camera_class* player_camera = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0));
camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
player_camera->mCamera.Stop();
dStage_MapEvent_dt_c* event_data =
dEvt_control_c::searchMapEventData(getEvent(), fopAcM_GetRoomNo(this));
@@ -1364,7 +1364,7 @@ void daTbox_c::settingDropDemoCamera() {
int daTbox_c::actionSwOnWait() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
setAction(&actionDemo2);
mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
} else if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) {
if (getEvent() == 0xff) {
@@ -1397,7 +1397,7 @@ int daTbox_c::actionDropWait() {
setAction(&actionDropDemo);
clrDzb();
field_0x97d = false;
mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
if (getSwType() == 0) {
settingDropDemoCamera();
}
@@ -1418,7 +1418,7 @@ int daTbox_c::actionDropWait() {
int daTbox_c::actionGenocide() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
setAction(&actionDemo2);
mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
} else if (!fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this))) {
if (mTimer != 0) {
@@ -1450,7 +1450,7 @@ int daTbox_c::actionDropWaitForWeb() {
shape_angle.z = 0;
shape_angle.x = 0;
fopAcM_SetGravity(this, -2.0f);
i_fopAcM_onSwitch(this, getSwNo());
fopAcM_onSwitch(this, getSwNo());
}
}
setBaseMtx();
@@ -1520,16 +1520,16 @@ void daTbox_c::setBaseMtx() {
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::transM(0.0f, -50.0f, 0.0f);
if (field_0x9fc != 0) {
mpModel->i_setBaseTRMtx(field_0xa00);
mpModel->setBaseTRMtx(field_0xa00);
} else {
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
mDoMtx_concat(mtx, field_0x988, field_0x988);
mDoMtx_copy(mpModel->getBaseTRMtx(), mBgMtx);
if (mpSlimeModel != NULL) {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 15.0f, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mpSlimeModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpSlimeModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
}
@@ -1620,7 +1620,7 @@ int daTbox_c::Execute(f32 (**param_0)[3][4]) {
mDoMtx_stack_c::YrotS(shape_angle.y);
mDoMtx_stack_c::multVec(&center, &center);
center += current.pos;
if ((getSwNo() != 0xff && i_fopAcM_isSwitch(this, getSwNo())) || getSwNo() == 0xff) {
if ((getSwNo() != 0xff && fopAcM_isSwitch(this, getSwNo())) || getSwNo() == 0xff) {
mCyl.SetC(center);
dComIfG_Ccsp()->Set(&mCyl);
}
rel/d/a/d_a_tbox2/d_a_tbox2.cpp
+5 -5
View File
@@ -19,7 +19,7 @@ void daTbox2_c::initBaseMtx() {
void daTbox2_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
@@ -344,7 +344,7 @@ void daTbox2_c::init_actionNotOpenDemo() {
/* 804978E4-8049794C 000F44 0068+00 1/0 0/0 0/0 .text actionNotOpenDemo__9daTbox2_cFv */
void daTbox2_c::actionNotOpenDemo() {
if (dComIfGp_evmng_endCheck(eventInfo.getEventId())) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
init_actionOpenWait();
} else {
demoProc();
@@ -360,7 +360,7 @@ void daTbox2_c::init_actionOpenDemo() {
/* 80497958-80497A0C 000FB8 00B4+00 1/0 0/0 0/0 .text actionOpenDemo__9daTbox2_cFv */
void daTbox2_c::actionOpenDemo() {
if (dComIfGp_evmng_endCheck(eventInfo.getEventId())) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
dKy_set_allcol_ratio(1.0f);
dComIfGp_event_setItemPartner(NULL);
@@ -393,13 +393,13 @@ void daTbox2_c::actionOpenWait() {
if (mModelType != TYPE_SMALL_e && daPy_py_c::i_checkNowWolf() &&
!midna_p->checkMetamorphoseEnable())
{
mStaffIdx = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
mStaffIdx = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
init_actionNotOpenDemo();
} else {
mReturnRupee = player_p->checkTreasureRupeeReturn(getItemNo());
setGetDemoItem();
mStaffIdx = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
mStaffIdx = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
init_actionOpenDemo();
}
rel/d/a/d_a_vrbox/d_a_vrbox.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ static int daVrbox_Draw(vrbox_class* i_this) {
mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - fvar,
dComIfGd_getInvViewMtx()[2][3]);
soraModel_p->i_setBaseTRMtx(mDoMtx_stack_c::get());
soraModel_p->setBaseTRMtx(mDoMtx_stack_c::get());
dKy_GxFog_set();
// these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData?
rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp
+6 -6
View File
@@ -297,15 +297,15 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
dComIfGd_setListSky();
mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - var_f31,
dComIfGd_getInvViewMtx()[2][3]);
kasumim_model_p->i_setBaseTRMtx(mDoMtx_stack_c::get());
kasumim_model_p->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(kasumim_model_p);
mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - var_f31,
dComIfGd_getInvViewMtx()[2][3]);
kumo_model_p->i_setBaseTRMtx(mDoMtx_stack_c::get());
kumo_model_p->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(kumo_model_p);
if (dStage_stagInfo_GetArg0(i_dComIfGp_getStage()->getStagInfo()) != 0 && sun_model_p != NULL &&
if (dStage_stagInfo_GetArg0(dComIfGp_getStage()->getStagInfo()) != 0 && sun_model_p != NULL &&
sun_p != NULL && sun_p->mSunAlpha > 0.0f)
{
sp14 = sun_p->mPos[0];
@@ -343,7 +343,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
}
mDoMtx_stack_c::scaleM(scale, scale, scale);
sun_model_p->i_setBaseTRMtx(mDoMtx_stack_c::get());
sun_model_p->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(sun_model_p);
if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) {
@@ -359,7 +359,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
mDoMtx_stack_c::scaleM(scale, scale + 0.15f, scale);
mDoMtx_stack_c::ZrotM(-mangZ);
sun2_model_p->i_setBaseTRMtx(mDoMtx_stack_c::get());
sun2_model_p->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(sun2_model_p);
mangZ += (s16)(483.0f + cM_rndF(100.0f));
}
@@ -473,7 +473,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
wind_vec = *windVec_p;
dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo());
dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo());
cam_eye = camera_p->mLookat.mEye;
cam_center = camera_p->mLookat.mCenter;
rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp
+4 -4
View File
@@ -260,10 +260,10 @@ extern "C" asm void __dt__12J3DFrameCtrlFv() {
void daBdoor_c::calcMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mOffsetY, current.pos.z);
mDoMtx_stack_c::YrotM(home.angle.y);
mpDoorModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpDoorModel->setBaseTRMtx(mDoMtx_stack_c::get());
mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 300.0f, current.pos.z);
mDoMtx_stack_c::YrotM(home.angle.y);
mpLockModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpLockModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 8066F7EC-8066F8E4 00044C 00F8+00 1/1 0/0 0/0 .text CreateInit__9daBdoor_cFv */
@@ -650,7 +650,7 @@ static char const l_staff_name[13] = "SHUTTER_DOOR";
/* 80670328-806703C0 000F88 0098+00 1/0 0/0 0/0 .text actionCloseWait__9daBdoor_cFv */
BOOL daBdoor_c::actionCloseWait() {
if (eventInfo.i_checkCommandDoor()) {
mStaffID = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
setAction(ACT_OPEN);
} else {
@@ -733,7 +733,7 @@ int daBdoor_c::execute() {
&actionEnd,
};
if (fopAcM_checkStatus(this, 0x1000)) {
mStaffID = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
} else {
(this->*l_action[mAction])();
rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp
+7 -7
View File
@@ -20,13 +20,13 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
u16 jointNo = i_joint->getJntNo();
J3DModel* model = j3dSys.getModel();
daDbDoor00_c* area = (daDbDoor00_c*)model->getUserArea();
MTXCopy(model->i_getAnmMtx(jointNo), mDoMtx_stack_c::get());
MTXCopy(model->getAnmMtx(jointNo), mDoMtx_stack_c::get());
if (jointNo == area->field_0x5c0 && area->field_0x585 == 1) {
mDoMtx_stack_c::YrotM(-area->field_0x58a);
} else if (jointNo == area->field_0x5c1 && area->field_0x585 == 0) {
mDoMtx_stack_c::YrotM(area->field_0x58a);
}
model->i_setAnmMtx(jointNo, mDoMtx_stack_c::get());
model->setAnmMtx(jointNo, mDoMtx_stack_c::get());
mDoMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
}
return 1;
@@ -142,8 +142,8 @@ void daDbDoor00_c::calcMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(home.angle.y);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModel2->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
mpModel2->setBaseTRMtx(mDoMtx_stack_c::get());
xyz.set(0.0f, 0.0f, -150.0f);
mDoMtx_stack_c::multVec(&xyz, &field_0x5a8);
xyz.set(0.0f, 0.0f, -400.0f);
@@ -350,7 +350,7 @@ int daDbDoor00_c::actionLockWait() {
/* 8045E000-8045E094 000D00 0094+00 1/0 0/0 0/0 .text actionLockOff__12daDbDoor00_cFv */
int daDbDoor00_c::actionLockOff() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
field_0x598 = i_dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0);
field_0x598 = dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0);
demoProc();
setAction(3);
} else {
@@ -362,7 +362,7 @@ int daDbDoor00_c::actionLockOff() {
/* 8045E094-8045E108 000D94 0074+00 1/0 0/0 0/0 .text actionLockDemo__12daDbDoor00_cFv */
int daDbDoor00_c::actionLockDemo() {
if (dComIfGp_evmng_endCheck("DBDOOR00_STOP_OPEN")) {
i_dComIfGp_event_reset();
dComIfGp_event_reset();
setAction(4);
} else {
demoProc();
@@ -374,7 +374,7 @@ int daDbDoor00_c::actionLockDemo() {
*/
int daDbDoor00_c::actionCloseWait() {
if (eventInfo.i_checkCommandDoor()) {
field_0x598 = i_dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0);
field_0x598 = dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0);
demoProc();
setAction(5);
dComIfG_Bgsp().Release(mpBgW);
rel/d/a/door/d_a_door_push/d_a_door_push.cpp
+4 -4
View File
@@ -124,7 +124,7 @@ int daDoorPush_c::Create() {
mpDoorBgW->SetPushPullCallback((dBgW_Base::PushPull_CallBack)PPCallBack2);
eventInfo.setArchiveName(l_arcName);
for (int i = 0; i < 2; i++) {
field_0x63a[i] = i_dComIfGp_getEventManager().getEventIdx(this, "PUSH_DOOR_L", 0xff);
field_0x63a[i] = dComIfGp_getEventManager().getEventIdx(this, "PUSH_DOOR_L", 0xff);
field_0x63e[i] = 0xff;
}
fopAcM_setCullSizeFar(this, 5.0f);
@@ -278,7 +278,7 @@ static char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"};
int daDoorPush_c::demoProc() {
daPy_py_c* player = daPy_getPlayerActorClass();
field_0x644 = i_dComIfGp_evmng_getMyStaffId("pdoor", NULL, 0);
field_0x644 = dComIfGp_evmng_getMyStaffId("pdoor", NULL, 0);
s32 actIdx =
dComIfGp_evmng_getMyActIdx(field_0x644, action_table, ARRAY_SIZE(action_table), 0, 0);
@@ -309,7 +309,7 @@ int daDoorPush_c::demoProc() {
break;
case OPEN_e:
if (rotate() != 0) {
((daPy_py_c*)dComIfGp_getPlayer(0))->i_offPushPullKeep();
((daPy_py_c*)dComIfGp_getPlayer(0))->offPushPullKeep();
setGoal();
fopAcM_seStart(this, Z2SE_OBJ_HYRULE_DR_STOP, 0);
field_0x641 = 1;
@@ -336,7 +336,7 @@ int daDoorPush_c::demoProc() {
/* 80678AEC-80678B10 000DAC 0024+00 1/1 0/0 0/0 .text rotateInit__12daDoorPush_cFv */
void daDoorPush_c::rotateInit() {
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
player->i_onPushPullKeep();
player->onPushPullKeep();
field_0x649 = 0;
}

Some files were not shown because too many files have changed in this diff Show More