Skip to content

Commit 4ba4f31

Browse files
caseifcaseif
committed
Miscellaneous improvements
1 parent 46a11f2 commit 4ba4f31

File tree

18 files changed

+638
-891
lines changed

18 files changed

+638
-891
lines changed

‎configure.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,7 @@ def MatchingFor(*versions) -> bool:
15691569
ActorRel(MatchingFor("GZ2E01"), "d_a_e_nest"),
15701570
ActorRel(MatchingFor("GZ2E01"), "d_a_e_rd"),
15711571
ActorRel(MatchingFor("GZ2E01"), "d_a_econt"),
1572-
ActorRel(NonMatching, "d_a_fr"),
1572+
ActorRel(MatchingFor("GZ2E01"), "d_a_fr"),
15731573
ActorRel(NonMatching, "d_a_grass"),
15741574
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag05"),
15751575
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag10"),
@@ -1707,7 +1707,7 @@ def MatchingFor(*versions) -> bool:
17071707
ActorRel(MatchingFor("GZ2E01"), "d_a_e_mb"),
17081708
ActorRel(MatchingFor("GZ2E01"), "d_a_e_md"),
17091709
ActorRel(MatchingFor("GZ2E01"), "d_a_e_mf"),
1710-
ActorRel(NonMatching, "d_a_e_mk"),
1710+
ActorRel(MatchingFor("GZ2E01"), "d_a_e_mk"),
17111711
ActorRel(NonMatching, "d_a_e_mk_bo"),
17121712
ActorRel(NonMatching, "d_a_e_mm"),
17131713
ActorRel(NonMatching, "d_a_e_mm_mt"),
@@ -1887,7 +1887,7 @@ def MatchingFor(*versions) -> bool:
18871887
ActorRel(NonMatching, "d_a_npc_zelR"),
18881888
ActorRel(NonMatching, "d_a_npc_zelRo"),
18891889
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_zelda"),
1890-
ActorRel(NonMatching, "d_a_npc_zra", extra_cflags=[DANPCF_C_HACK]),
1890+
ActorRel(Equivalent, "d_a_npc_zra", extra_cflags=[DANPCF_C_HACK]), # regalloc
18911891
ActorRel(NonMatching, "d_a_npc_zrc", extra_cflags=[DANPCF_C_HACK]),
18921892
ActorRel(NonMatching, "d_a_npc_zrz", extra_cflags=[DANPCF_C_HACK]),
18931893
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_Lv5Key"),

‎include/JSystem/JParticle/JPAEmitter.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class JPABaseEmitter {
138138
void getGlobalTranslation(JGeometry::TVec3<f32>* out) const { out->set(mGlobalTrs); }
139139
void setGlobalDynamicsScale(const JGeometry::TVec3<f32>& i_scale) { mGlobalScl.set(i_scale); }
140140
void setGlobalAlpha(u8 alpha) { mGlobalPrmClr.a = alpha; }
141-
u8 getGlobalAlpha() { return mGlobalPrmClr.a; }
141+
u8 getGlobalAlpha() const { return mGlobalPrmClr.a; }
142142
void getGlobalPrmColor(GXColor& color) { color = mGlobalPrmClr; }
143143
void setGlobalPrmColor(u8 r, u8 g, u8 b) { mGlobalPrmClr.r = r; mGlobalPrmClr.g = g; mGlobalPrmClr.b = b; }
144144
void setGlobalEnvColor(u8 r, u8 g, u8 b) { mGlobalEnvClr.r = r; mGlobalEnvClr.g = g; mGlobalEnvClr.b = b; }
@@ -198,10 +198,10 @@ class JPABaseEmitter {
198198

199199
u32 getUserWork() { return mpUserWork; }
200200
void setUserWork(u32 userWork) { mpUserWork = userWork; }
201-
u32 getParticleNumber() {
201+
u32 getParticleNumber() const {
202202
return mAlivePtclBase.getNum() + mAlivePtclChld.getNum();
203203
}
204-
bool isEnableDeleteEmitter() {
204+
bool isEnableDeleteEmitter() const {
205205
return checkStatus(JPAEmtrStts_EnableDeleteEmitter) && getParticleNumber() == 0;
206206
}
207207
void setDrawTimes(u8 drawTimes) { mDrawTimes = drawTimes; }

‎include/d/actor/d_a_alink.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ class daAlinkHIO_cut_c {
221221
/* 0x0 */ u8 unk_0x0;
222222
};
223223

224-
class daAlinkHIO_c
224+
class daAlinkHIO_c
225225
#ifdef DEBUG
226-
: public mDoHIO_entry_c
226+
: public mDoHIO_entry_c
227227
#endif
228228
{
229229
public:
@@ -3475,19 +3475,19 @@ class daAlink_c : public daPy_py_c {
34753475
u32 getStartEvent() { return fopAcM_GetParam(this) >> 0x18; }
34763476
BOOL checkClimbFall() { return checkLadderFall(); }
34773477

3478-
bool checkMidnaWolfDashAnime() { return checkNoResetFlg1(FLG1_DASH_MODE); }
3479-
bool checkMidnaClingAnime() { return mMidnaAnm == 1; }
3480-
bool checkMidnaLowClingAnime() { return mMidnaAnm == 2; }
3481-
bool checkMidnaLookAroundAnime() { return mMidnaAnm == 3; }
3482-
bool checkMidnaPanicAnime() { return mMidnaAnm == 5; }
3483-
bool checkMidnaWolfDeadAnime() { return mMidnaAnm == 6; }
3484-
bool checkMidnaWolfSwimDeadAnime() { return mMidnaAnm == 7; }
3485-
bool checkMidnaRopeWaitStaggerAnime() { return mMidnaAnm == 8; }
3486-
bool checkMidnaRopeMoveStaggerAnime() { return mMidnaAnm == 9; }
3487-
bool checkMidnaGanonCatchAnm() { return mMidnaAnm == 10; }
3488-
bool checkMidnaGanonThrowLeftAnm() { return mMidnaAnm == 11; }
3489-
bool checkMidnaGanonThrowRightAnm() { return mMidnaAnm == 12; }
3490-
bool checkMidnaDigInAnime() { return mMidnaAnm == 13; }
3478+
bool checkMidnaWolfDashAnime() const { return checkNoResetFlg1(FLG1_DASH_MODE); }
3479+
bool checkMidnaClingAnime() const { return mMidnaAnm == 1; }
3480+
bool checkMidnaLowClingAnime() const { return mMidnaAnm == 2; }
3481+
bool checkMidnaLookAroundAnime() const { return mMidnaAnm == 3; }
3482+
bool checkMidnaPanicAnime() const { return mMidnaAnm == 5; }
3483+
bool checkMidnaWolfDeadAnime() const { return mMidnaAnm == 6; }
3484+
bool checkMidnaWolfSwimDeadAnime() const { return mMidnaAnm == 7; }
3485+
bool checkMidnaRopeWaitStaggerAnime() const { return mMidnaAnm == 8; }
3486+
bool checkMidnaRopeMoveStaggerAnime() const { return mMidnaAnm == 9; }
3487+
bool checkMidnaGanonCatchAnm() const { return mMidnaAnm == 10; }
3488+
bool checkMidnaGanonThrowLeftAnm() const { return mMidnaAnm == 11; }
3489+
bool checkMidnaGanonThrowRightAnm() const { return mMidnaAnm == 12; }
3490+
bool checkMidnaDigInAnime() const { return mMidnaAnm == 13; }
34913491

34923492
void clearMidnaMsgNum() {
34933493
mMidnaMsgNum = 0xffff;

‎include/d/actor/d_a_e_mk.h‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
*/
1919
class e_mk_class {
2020
public:
21-
/* 8071C190 */ e_mk_class() {}
22-
2321
enum e_mk_ACTION {
2422
ACT_WAIT,
2523
ACT_MOVE,
@@ -128,20 +126,4 @@ class e_mk_class {
128126

129127
STATIC_ASSERT(sizeof(e_mk_class) == 0xcf8);
130128

131-
class daE_MK_HIO_c : public JORReflexible {
132-
public:
133-
/* 8071412C */ daE_MK_HIO_c();
134-
/* 8071C3EC */ virtual ~daE_MK_HIO_c() {};
135-
136-
void genMessage(JORMContext*);
137-
138-
/* 0x04 */ s8 field_0x4;
139-
/* 0x08 */ f32 mSize;
140-
/* 0x0C */ f32 mBoomerangRatio;
141-
/* 0x10 */ f32 mPlayerThrowDistMax;
142-
/* 0x14 */ u8 mHaltAction;
143-
/* 0x18 */ cXyz mCrownPosAdjust;
144-
};
145-
146-
147129
#endif /* D_A_E_MK_H */

‎include/d/actor/d_a_fr.h‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,25 +59,5 @@ class fr_class : public fopEn_enemy_c {
5959

6060
STATIC_ASSERT(sizeof(fr_class) == 0x9e8);
6161

62-
class daFr_HIO_c : public JORReflexible {
63-
public:
64-
/* 805198EC */ daFr_HIO_c();
65-
/* 8051B920 */ virtual ~daFr_HIO_c() {};
66-
67-
void genMessage(JORMContext*);
68-
69-
/* 0x04 */ s8 field_0x4;
70-
/* 0x08 */ f32 field_0x8;
71-
/* 0x0C */ f32 field_0xc;
72-
/* 0x10 */ f32 field_0x10;
73-
/* 0x14 */ f32 field_0x14;
74-
/* 0x18 */ f32 field_0x18;
75-
/* 0x1C */ f32 field_0x1c;
76-
/* 0x20 */ f32 field_0x20;
77-
/* 0x24 */ f32 field_0x24;
78-
/* 0x28 */ f32 field_0x28;
79-
/* 0x2C */ f32 field_0x2c;
80-
};
81-
8262

8363
#endif /* D_A_FR_H */

‎include/d/actor/d_a_midna.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class daMidna_c : public fopAc_ac_c {
319319

320320
MtxP getMtxHairTop() { return mpShadowModel->getAnmMtx(10); }
321321

322-
bool checkSetAnime(int param_0, daMidna_ANM i_anm) {
322+
bool checkSetAnime(int param_0, daMidna_ANM i_anm) const {
323323
return mBckHeap[param_0].getIdx() == m_anmDataTable[i_anm].mResID;
324324
}
325325

‎include/d/actor/d_a_npc_cd2.h‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ inline f32 Cd2_HIO_cylH(int param_1) {
165165
return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mCylH : l_Cd2_HIO.field_0x20c4[param_1 - 16].mCylH;
166166
}
167167

168-
inline int Cd2_HIO_maxLmtX_BACKBONE(int param_1) {
168+
inline s16 Cd2_HIO_maxLmtX_BACKBONE(int param_1) {
169169
s16 rv;
170170
if (param_1 < 16) {
171171
rv = l_Cd2_HIO.field_0x0004[param_1].mMaxLmtX_BACKBONE;
@@ -175,7 +175,7 @@ inline int Cd2_HIO_maxLmtX_BACKBONE(int param_1) {
175175
return rv;
176176
}
177177

178-
inline int Cd2_HIO_maxLmtY_BACKBONE(int param_1) {
178+
inline s16 Cd2_HIO_maxLmtY_BACKBONE(int param_1) {
179179
s16 rv;
180180
if (param_1 < 16) {
181181
rv = l_Cd2_HIO.field_0x0004[param_1].mMaxLmtY_BACKBONE;
@@ -185,7 +185,7 @@ inline int Cd2_HIO_maxLmtY_BACKBONE(int param_1) {
185185
return rv;
186186
}
187187

188-
inline int Cd2_HIO_maxLmtX_NECK(int param_1) {
188+
inline s16 Cd2_HIO_maxLmtX_NECK(int param_1) {
189189
s16 rv;
190190
if (param_1 < 16) {
191191
rv = l_Cd2_HIO.field_0x0004[param_1].mMaxLmtX_NECK;
@@ -195,7 +195,7 @@ inline int Cd2_HIO_maxLmtX_NECK(int param_1) {
195195
return rv;
196196
}
197197

198-
inline int Cd2_HIO_maxLmtY_NECK(int param_1) {
198+
inline s16 Cd2_HIO_maxLmtY_NECK(int param_1) {
199199
s16 rv;
200200
if (param_1 < 16) {
201201
rv = l_Cd2_HIO.field_0x0004[param_1].mMaxLmtY_NECK;
@@ -205,7 +205,7 @@ inline int Cd2_HIO_maxLmtY_NECK(int param_1) {
205205
return rv;
206206
}
207207

208-
inline int Cd2_HIO_maxLmtX_HEAD(int param_1) {
208+
inline s16 Cd2_HIO_maxLmtX_HEAD(int param_1) {
209209
s16 rv;
210210
if (param_1 < 16) {
211211
rv = l_Cd2_HIO.field_0x0004[param_1].mMaxLmtX_HEAD;
@@ -215,7 +215,7 @@ inline int Cd2_HIO_maxLmtX_HEAD(int param_1) {
215215
return rv;
216216
}
217217

218-
inline int Cd2_HIO_maxLmtY_HEAD(int param_1) {
218+
inline s16 Cd2_HIO_maxLmtY_HEAD(int param_1) {
219219
s16 rv;
220220
if (param_1 < 16) {
221221
rv = l_Cd2_HIO.field_0x0004[param_1].mMaxLmtY_HEAD;
@@ -225,7 +225,7 @@ inline int Cd2_HIO_maxLmtY_HEAD(int param_1) {
225225
return rv;
226226
}
227227

228-
inline int Cd2_HIO_minLmtX_BACKBONE(int param_1) {
228+
inline s16 Cd2_HIO_minLmtX_BACKBONE(int param_1) {
229229
s16 rv;
230230
if (param_1 < 16) {
231231
rv = l_Cd2_HIO.field_0x0004[param_1].mMinLmtX_BACKBONE;
@@ -235,7 +235,7 @@ inline int Cd2_HIO_minLmtX_BACKBONE(int param_1) {
235235
return rv;
236236
}
237237

238-
inline int Cd2_HIO_minLmtY_BACKBONE(int param_1) {
238+
inline s16 Cd2_HIO_minLmtY_BACKBONE(int param_1) {
239239
s16 rv;
240240
if (param_1 < 16) {
241241
rv = l_Cd2_HIO.field_0x0004[param_1].mMinLmtY_BACKBONE;
@@ -245,7 +245,7 @@ inline int Cd2_HIO_minLmtY_BACKBONE(int param_1) {
245245
return rv;
246246
}
247247

248-
inline int Cd2_HIO_minLmtX_NECK(int param_1) {
248+
inline s16 Cd2_HIO_minLmtX_NECK(int param_1) {
249249
s16 rv;
250250
if (param_1 < 16) {
251251
rv = l_Cd2_HIO.field_0x0004[param_1].mMinLmtX_NECK;
@@ -255,7 +255,7 @@ inline int Cd2_HIO_minLmtX_NECK(int param_1) {
255255
return rv;
256256
}
257257

258-
inline int Cd2_HIO_minLmtY_NECK(int param_1) {
258+
inline s16 Cd2_HIO_minLmtY_NECK(int param_1) {
259259
s16 rv;
260260
if (param_1 < 16) {
261261
rv = l_Cd2_HIO.field_0x0004[param_1].mMinLmtY_NECK;
@@ -265,7 +265,7 @@ inline int Cd2_HIO_minLmtY_NECK(int param_1) {
265265
return rv;
266266
}
267267

268-
inline int Cd2_HIO_minLmtX_HEAD(int param_1) {
268+
inline s16 Cd2_HIO_minLmtX_HEAD(int param_1) {
269269
s16 rv;
270270
if (param_1 < 16) {
271271
rv = l_Cd2_HIO.field_0x0004[param_1].mMinLmtX_HEAD;
@@ -275,7 +275,7 @@ inline int Cd2_HIO_minLmtX_HEAD(int param_1) {
275275
return rv;
276276
}
277277

278-
inline int Cd2_HIO_minLmtY_HEAD(int param_1) {
278+
inline s16 Cd2_HIO_minLmtY_HEAD(int param_1) {
279279
s16 rv;
280280
if (param_1 < 16) {
281281
rv = l_Cd2_HIO.field_0x0004[param_1].mMinLmtY_HEAD;
@@ -304,16 +304,10 @@ class PathTrace_c {
304304
bool isPath() { return mPath != NULL; }
305305
s8 getArg0() { return mPath->m_points[field_0x20].mArg0; }
306306
s8 getArg1() { return mPath->m_points[field_0x20].mArg1; }
307-
Vec getPoint(int index) { return mPath->m_points[index].m_position; }
307+
Vec getPoint(u16 index) { return mPath->m_points[(u16)index].m_position; }
308308
void setLastPointNum() { field_0x20 = mPath->m_num - 1; }
309309
u16 getLastPointNum() {
310-
u32 rv;
311-
if (field_0x24 == 1) {
312-
rv = mPath->m_num - 1;
313-
} else {
314-
return 0;
315-
}
316-
return rv;
310+
return field_0x24 == 1 ? mPath->m_num - 1 : 0;
317311
}
318312

319313
/* 0x00 */ fopAc_ac_c* mMyself;

‎include/d/actor/d_a_npc_cdn3.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ class daNpcCdn3_c : public daNpcCd2_c {
149149
u16 startTime = getStartTime();
150150
u16 endTime = getEndTime();
151151
if (startTime != 0xff && endTime != 0xff) {
152-
u32 x = (u16)(startTime / 10);
153-
u32 y = startTime % 10;
154-
field_0xb8e = ((u16)(y * 10) + (x * 60));
155-
u32 x2 = (u16)(endTime / 10);
156-
u32 y2 = endTime % 10;
157-
field_0xb8e = ((u16)(y2 * 10) + (x2 * 60));
152+
u16 x = startTime / 10;
153+
u16 y = (startTime % 10) * 10;
154+
field_0xb8c = y + x * 60;
155+
x = endTime / 10;
156+
y = (endTime % 10) * 10;
157+
field_0xb8e = y + x * 60;
158158
field_0xb96 = 0;
159159
} else {
160160
field_0xb96 = 1;
@@ -320,7 +320,7 @@ class daNpcCdn3_c : public daNpcCd2_c {
320320
return 1;
321321
}
322322

323-
inline bool searchFirstScheduleTag(fopAc_ac_c* param_1);
323+
inline bool searchFirstScheduleTag();
324324
inline bool searchNextScheduleTag();
325325

326326
static actionFunc ActionTable[8][2];

‎include/d/actor/d_a_npc_zra.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "d/actor/d_a_npc.h"
55

6+
class daNpc_zrA_HIO_c;
67
/**
78
* @ingroup actors-npcs
89
* @class daNpc_zrA_Path_c
@@ -332,7 +333,7 @@ class daNpc_zrA_c : public daNpcF_c {
332333
/* 0x1248 */ daNpcF_Lookat_c mLookat;
333334
/* 0x12E4 */ dPaPo_c mPaPo;
334335
/* 0x131C */ daNpcF_ActorMngr_c mActorMngr[3];
335-
/* 0x1334 */ u8 field_0x1334[4];
336+
/* 0x1334 */ daNpc_zrA_HIO_c* mpHIO;
336337
/* 0x1338 */ dCcD_Cyl mCcCyl;
337338
/* 0x1474 */ ActionFn mpNextActionFn;
338339
/* 0x1480 */ ActionFn mpActionFn;

‎include/d/dolzel_rel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define DOLZEL_REL_H
33

44
// PCH breaks debug build for RELs right now
5-
#if __MWERKS__
5+
#if __MWERKS__ && !DEBUG
66
#include "d/dolzel_rel.mch"
77
#else
88
#include "d/dolzel_rel.pch"

0 commit comments

Comments
 (0)