d_stage fixup

This commit is contained in:
Jasper St. Pierre
2023-10-02 22:25:48 -07:00
parent 2dc87a5274
commit b0bfe1c49e
5 changed files with 49 additions and 27 deletions
+1 -1
View File
@@ -822,7 +822,7 @@ inline s8 dComIfGp_getStartStageLayer() {
return g_dComIfG_gameInfo.play.getStartStageLayer();
}
inline s16 dComIfGp_getStartStagePoint() {
inline s32 dComIfGp_getStartStagePoint() {
return g_dComIfG_gameInfo.play.getStartStagePoint();
}
+1
View File
@@ -413,5 +413,6 @@ void dKy_set_vrboxsoracol_ratio(f32 ratio);
void dKy_set_vrboxkumocol_ratio(f32 ratio);
cXyz dKy_get_orion_pos();
cXyz dKy_get_hokuto_pos();
void dKy_DayProc();
#endif /* D_KANKYO_D_KANKYO_H */
+11 -11
View File
@@ -133,13 +133,13 @@ public:
* Translates the `now` Matrix by the given cXyz
* @param xyz The xyz translation vector
*/
/* 8000CD64 */ static inline void transS(cXyz const& xyz) { MTXTrans(now, xyz.x, xyz.y, xyz.z); }
static inline void transS(cXyz const& xyz) { MTXTrans(now, xyz.x, xyz.y, xyz.z); }
/**
* Translates a new Matrix by the given cXyz and then concatenates it with the `now` matrix
* @param xyz The xyz translation vector
*/
/* 8000CD64 */ static inline void transM(cXyz const& xyz) { transM(xyz.x, xyz.y, xyz.z); }
static inline void transM(cXyz const& xyz) { transM(xyz.x, xyz.y, xyz.z); }
/**
* Translates a new Matrix by the given X, Y, and Z values and then concatenates it with the `now` matrix
@@ -147,19 +147,19 @@ public:
* @param y The y-axis translation value
* @param z The z-axis translation value
*/
/* 8000CD9C */ static void transM(f32 x, f32 y, f32 z);
static void transM(f32 x, f32 y, f32 z);
/**
* Scales the `now` Matrix by the given cXyz
* @param xyz The xyz scale vector
*/
/* 8000CE00 */ static void scaleS(cXyz const& xyz);
static void scaleS(cXyz const& xyz);
/**
* Scales a new Matrix by the given cXyz and then concatenates it with the `now` matrix
* @param xyz The xyz scale vector
*/
/* 8000CE70 */ static void scaleM(cXyz const& xyz) { scaleM(xyz.x, xyz.y, xyz.z); }
static void scaleM(cXyz const& xyz) { scaleM(xyz.x, xyz.y, xyz.z); }
/**
* Scales a new Matrix by the given X, Y, and Z values and then concatenates it with the `now` matrix
@@ -167,25 +167,25 @@ public:
* @param y The y-axis scale value
* @param z The z-axis scale value
*/
/* 8000CE38 */ static void scaleM(f32 x, f32 y, f32 z);
static void scaleM(f32 x, f32 y, f32 z);
/* 8000CE9C */ static void XYZrotS(csXyz const& xyz);
static void XYZrotS(csXyz const& xyz);
/**
* Rotates the `now` matrix by the given csXyz in the order X, Y, Z
* @param xyz The xyz rotation vector
*/
/* 8000CED4 */ static void XYZrotM(csXyz const& xyz);
static void XYZrotM(csXyz const& xyz);
/* 8000CF0C */ static void ZXYrotS(csXyz const& xyz);
static void ZXYrotS(csXyz const& xyz);
/**
* Rotates the `now` matrix by the given csXyz in the order Z, X, Y
* @param xyz The xyz rotation vector
*/
/* 8000CF44 */ static void ZXYrotM(csXyz const& xyz) { ZXYrotM(xyz.x, xyz.y, xyz.z); }
static void ZXYrotM(csXyz const& xyz) { ZXYrotM(xyz.x, xyz.y, xyz.z); }
/* 8000CF7C */ static void quatM(Quaternion const*);
static void quatM(Quaternion const*);
/**
* Returns the `now` Matrix