d_magma OK (#947)

Co-authored-by: Roland <roland@wildpaws.xyz>

Author: LagoLunatic

configure.py

@@ -518,7 +518,7 @@ def EquivalentFor(*versions):
             Object(Matching,    "d/d_event.cpp"),
             Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d/d_event_data.cpp"),
             Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d/d_event_manager.cpp"),
-            Object(NonMatching, "d/d_magma.cpp"),
+            Object(Matching,    "d/d_magma.cpp"),
             Object(Matching, "d/d_boss_magma.cpp"),
             Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d/d_grass.cpp"),
             Object(NonMatching, "d/d_tree.cpp"),

include/d/d_magma.h

@@ -11,13 +11,12 @@ class dMagma_ball_c {
     virtual ~dMagma_ball_c() {}
     virtual void calc(f32, u8, int) = 0;
     virtual void update() = 0;
-
     virtual void setup(f32, u8, int) = 0;
-    void draw();
 
+    void draw();
     BOOL rangeCheck(cXyz&, f32*);
 
-public:
+protected:
     /* 0x04 */ cXyz mPos;
     /* 0x10 */ f32 mScale;
     /* 0x14 */ f32 mBaseY;
@@ -35,7 +34,7 @@ class dMagma_ballPath_c : public dMagma_ball_c {
     virtual void update();
     virtual void setup(f32, u8, int);
 
-public:
+private:
     /* 0x7C */ u8 mWaveTimer;
 };
 
@@ -47,7 +46,7 @@ class dMagma_ballBoss_c : public dMagma_ball_c {
     virtual void update();
     virtual void setup(f32, u8, int);
 
-public:
+private:
     /* 0x7C */ s16 field_0x7C;
 };
 
@@ -65,11 +64,13 @@ class dMagma_floor_c {
     dMagma_floor_c* getNext() { return mpNext; }
     void setNext(dMagma_floor_c* v) { mpNext = v; }
     dMagma_ball_c** getBall() { return mpBalls; }
-    s32 getBallNum() { return mBallNum; }
-    cXyz& getPos() { return mPos; }
+    int getBallNum() { return mBallNum; }
+    cXyz* getPos() { return &mPos; }
     f32 getScaleX() { return mScaleX; }
     f32 getScaleZ() { return mScaleZ; }
+    void setYpos(f32 y) { mPos.y = y; }
 
+private:
     /* 0x00 */ dMagma_ball_c** mpBalls;
     /* 0x04 */ u8 mBallNum;
     /* 0x05 */ u8 mPathNo;
@@ -91,6 +92,7 @@ class dMagma_room_c {
 
     dMagma_room_c();
 
+private:
     /* 0x0 */ dMagma_floor_c* mpFirst;
 };
 
@@ -101,25 +103,26 @@ class dMagma_packet_c : public J3DPacket {
     void update();
     f32 checkYpos(cXyz&);
     dMagma_floor_c* newFloor(cXyz&, cXyz&, int, s16);
-    void deleteRoom(s32 roomNo) { mRoom[roomNo].deleteFloor(); }
+    void deleteRoom(int roomNo) { mRoom[roomNo].deleteFloor(); }
 
     virtual void draw();
     virtual ~dMagma_packet_c();
 
-    static GXTexObj& getKuroTexObj() { return mKuroTexObj; }
-    static GXTexObj& getColTexObj() { return mColTexObj; }
-    static Mtx& getKuroMtx() { return mKuroMtx; }
+    static GXTexObj* getKuroTexObj() { return &mKuroTexObj; }
+    static GXTexObj* getColTexObj() { return &mColTexObj; }
+    static MtxP getKuroMtx() { return mKuroMtx; }
 
     static GXTexObj mKuroTexObj;
     static Mtx mKuroMtx;
     static GXTexObj mColTexObj;
     static Mtx mBallMtx;
     static Mtx mFloorMtx;
 
+private:
     /* 0x010 */ dMagma_floor_c mFloor[8];
     /* 0x590 */ dMagma_room_c mRoom[64];
     /* 0x690 */ GXColor mColor1;
     /* 0x694 */ f32 mTimer;
 };
 
-#endif /* D_MAGMA_H */
+#endif /* D_MAGMA_H */

include/dolphin/gx/GXTexture.h

@@ -17,8 +17,8 @@ void GXInitTexObjLOD(GXTexObj* obj, GXTexFilter min_filter, GXTexFilter max_filt
                      f32 max_lod, f32 lod_bias, GXBool bias_clamp, GXBool edge_lod,
                      GXAnisotropy aniso);
 void* GXGetTexObjData(GXTexObj* obj);
-u16 GXGetTexObjWidth(GXTexObj* obj);
-u16 GXGetTexObjHeight(GXTexObj* obj);
+u16 GXGetTexObjWidth(const GXTexObj* obj);
+u16 GXGetTexObjHeight(const GXTexObj* obj);
 GXTexFmt GXGetTexObjFmt(const GXTexObj* obj);
 GXTexWrapMode GXGetTexObjWrapS(GXTexObj* obj);
 GXTexWrapMode GXGetTexObjWrapT(GXTexObj* obj);

src/d/actor/d_a_btd.cpp

@@ -2400,7 +2400,7 @@ static BOOL daBtd_Execute(btd_class* i_this) {
     }
     i_this->m6E88 = 1;
     fVar12 = i_this->m6E80;
-    i_this->floor->getPos().y = fVar12;
+    i_this->floor->setYpos(fVar12);
     i_this->m6E7C += REG0_F(15) + 30.0f;
     if (i_this->m6E7C > REG0_F(18) + 2300.0f) {
         i_this->m6E7C = REG0_F(18) + 2300.0f;