more misc. cleanup

zeldaret · Oct 31, 2024 · 9042556 · 9042556
1 parent 30777a8
commit 9042556
Show file tree

Hide file tree

Showing 121 changed files with 2,274 additions and 17,363 deletions.
diff --git a/configure.py b/configure.py
@@ -340,7 +340,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "m_Do/m_Do_printf.cpp"),
             Object(Matching, "m_Do/m_Do_audio.cpp"),
             Object(Matching, "m_Do/m_Do_controller_pad.cpp"),
-            Object(NonMatching, "m_Do/m_Do_graphic.cpp"),
+            Object(Equivalent, "m_Do/m_Do_graphic.cpp"),
             Object(NonMatching, "m_Do/m_Do_machine.cpp"),
             Object(Matching, "m_Do/m_Do_mtx.cpp"),
             Object(NonMatching, "m_Do/m_Do_ext.cpp"),
@@ -349,7 +349,7 @@ def MatchingFor(*versions):
             Object(Matching, "m_Do/m_Do_dvd_thread.cpp"),
             Object(Matching, "m_Do/m_Do_DVDError.cpp"),
             Object(Matching, "m_Do/m_Do_MemCard.cpp"),
-            Object(NonMatching, "m_Do/m_Do_MemCardRWmng.cpp"),
+            Object(Matching, "m_Do/m_Do_MemCardRWmng.cpp"),
             Object(Matching, "m_Do/m_Do_machine_exception.cpp"),
         ],
     },
@@ -360,7 +360,7 @@ def MatchingFor(*versions):
         "progress_category": "game",
         "host": True,
         "objects": [
-            Object(NonMatching, "c/c_damagereaction.cpp"),
+            Object(Matching, "c/c_damagereaction.cpp"),
             Object(Matching, "c/c_dylink.cpp"),
         ],
     },
@@ -441,7 +441,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "d/d_stage.cpp"),
             Object(Matching, "d/d_map.cpp"),
             Object(Matching, "d/d_com_inf_game.cpp", extra_cflags=['-pragma "nosyminline on"']),
-            Object(NonMatching, "d/d_com_static.cpp"),
+            Object(Matching, "d/d_com_static.cpp"),
             Object(Matching, "d/d_com_inf_actor.cpp"),
             Object(Matching, "d/d_bomb.cpp"),
             Object(Matching, "d/d_lib.cpp"),
@@ -456,12 +456,12 @@ def MatchingFor(*versions):
             Object(NonMatching, "d/d_demo.cpp"),
             Object(Matching, "d/d_door_param2.cpp"),
             Object(NonMatching, "d/d_resorce.cpp"),
-            Object(NonMatching, "d/d_map_path.cpp"),
+            Object(Matching, "d/d_map_path.cpp"),
             Object(NonMatching, "d/d_map_path_fmap.cpp"),
             Object(NonMatching, "d/d_map_path_dmap.cpp"),
-            Object(NonMatching, "d/d_event.cpp"),
+            Object(Matching, "d/d_event.cpp"),
             Object(Matching, "d/d_event_data.cpp"),
-            Object(NonMatching, "d/d_event_manager.cpp"),
+            Object(Matching, "d/d_event_manager.cpp", extra_cflags=['-pragma "nosyminline on"']),
             Object(Matching, "d/d_event_lib.cpp"),
             Object(Matching, "d/d_simple_model.cpp"),
             Object(NonMatching, "d/d_particle.cpp"),
@@ -494,11 +494,11 @@ def MatchingFor(*versions):
             Object(Matching, "d/d_bg_w_base.cpp", extra_cflags=['-pragma "nosyminline on"']),
             Object(NonMatching, "d/d_bg_w_kcol.cpp"),
             Object(Matching, "d/d_bg_w_sv.cpp"),
-            Object(NonMatching, "d/d_cc_d.cpp"),
+            Object(Equivalent, "d/d_cc_d.cpp"),
             Object(Matching, "d/d_cc_mass_s.cpp", extra_cflags=['-pragma "nosyminline on"']),
             Object(NonMatching, "d/d_cc_s.cpp"),
             Object(Matching, "d/d_cc_uty.cpp"),
-            Object(NonMatching, "d/d_cam_param.cpp"),
+            Object(NonMatching, "d/d_cam_param.cpp", extra_cflags=['-pragma "nosyminline on"']),
             Object(NonMatching, "d/d_ev_camera.cpp"),
             Object(Matching, "d/d_spline_path.cpp"),
             Object(Matching, "d/d_item_data.cpp"),
@@ -523,13 +523,13 @@ def MatchingFor(*versions):
             Object(NonMatching, "d/d_file_sel_warning.cpp"),
             Object(Matching, "d/d_file_sel_info.cpp"),
             Object(Matching, "d/d_bright_check.cpp"),
-            Object(NonMatching, "d/d_scope.cpp"),
-            Object(NonMatching, "d/d_select_cursor.cpp"),
+            Object(NonMatching, "d/d_scope.cpp", extra_cflags=['-pragma "nosyminline on"']),
+            Object(Equivalent, "d/d_select_cursor.cpp"),
             Object(Matching, "d/d_select_icon.cpp"),
             Object(Matching, "d/d_shop_camera.cpp"),
             Object(Matching, "d/d_shop_item_ctrl.cpp"),
             Object(Matching, "d/d_shop_system.cpp"),
-            Object(NonMatching, "d/d_gameover.cpp"),
+            Object(Matching, "d/d_gameover.cpp"),
             Object(NonMatching, "d/d_kankyo.cpp"),
             Object(Matching, "d/d_kyeff.cpp"),
             Object(Matching, "d/d_kyeff2.cpp"),
@@ -541,15 +541,15 @@ def MatchingFor(*versions):
             Object(NonMatching, "d/d_menu_dmap_map.cpp"),
             Object(Matching, "d/d_menu_map_common.cpp"),
             Object(Matching, "d/d_menu_fishing.cpp"),
-            Object(Equivalent, "d/d_menu_fmap.cpp"),
+            Object(Matching, "d/d_menu_fmap.cpp", extra_cflags=['-pragma "nosyminline on"']),
             Object(NonMatching, "d/d_menu_fmap_map.cpp"),
             Object(Matching, "d/d_menu_fmap2D.cpp"),
             Object(Matching, "d/d_menu_insect.cpp"),
             Object(Matching, "d/d_menu_item_explain.cpp"),
             Object(NonMatching, "d/d_menu_letter.cpp"),
             Object(Matching, "d/d_menu_option.cpp"),
             Object(Matching, "d/d_menu_ring.cpp"),
-            Object(NonMatching, "d/d_menu_save.cpp"),
+            Object(Equivalent, "d/d_menu_save.cpp"),
             Object(Matching, "d/d_menu_skill.cpp"),
             Object(Matching, "d/d_menu_window_HIO.cpp"),
             Object(NonMatching, "d/d_menu_window.cpp"),
@@ -566,7 +566,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "d/d_msg_class.cpp"),
             Object(NonMatching, "d/d_msg_object.cpp"),
             Object(NonMatching, "d/d_msg_unit.cpp"),
-            Object(NonMatching, "d/d_msg_scrn_3select.cpp"),
+            Object(Matching, "d/d_msg_scrn_3select.cpp", extra_cflags=['-pragma "nosyminline on"']),
             Object(Matching, "d/d_msg_scrn_arrow.cpp"),
             Object(Matching, "d/d_msg_scrn_base.cpp"),
             Object(Matching, "d/d_msg_scrn_boss.cpp"),
@@ -1011,12 +1011,12 @@ def MatchingFor(*versions):
         [
             Object(NonMatching, "JSystem/J3DGraphLoader/J3DMaterialFactory.cpp"),
             Object(NonMatching, "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp"),
-            Object(NonMatching, "JSystem/J3DGraphLoader/J3DClusterLoader.cpp"),
+            Object(Equivalent, "JSystem/J3DGraphLoader/J3DClusterLoader.cpp"),
             Object(Equivalent, "JSystem/J3DGraphLoader/J3DModelLoader.cpp"),
             Object(NonMatching, "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"),
-            Object(NonMatching, "JSystem/J3DGraphLoader/J3DJointFactory.cpp"),
-            Object(NonMatching, "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"),
-            Object(NonMatching, "JSystem/J3DGraphLoader/J3DAnmLoader.cpp"),
+            Object(Matching, "JSystem/J3DGraphLoader/J3DJointFactory.cpp"),
+            Object(Matching, "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"),
+            Object(Equivalent, "JSystem/J3DGraphLoader/J3DAnmLoader.cpp"),
         ],
     ),
     JSystemLib(
@@ -1365,7 +1365,7 @@ def MatchingFor(*versions):
     ActorRel(Matching, "d_a_door_knob00"),
     ActorRel(Matching, "d_a_door_shutter"),
     ActorRel(Matching, "d_a_door_spiral"),
-    ActorRel(NonMatching, "d_a_dshutter"),
+    ActorRel(Matching, "d_a_dshutter"),
     ActorRel(NonMatching, "d_a_ep"),
     ActorRel(Matching, "d_a_hitobj"),
     ActorRel(Matching, "d_a_kytag00"),
@@ -1407,7 +1407,7 @@ def MatchingFor(*versions):
     ActorRel(Matching, "d_a_disappear"),
     ActorRel(NonMatching, "d_a_mg_rod"),
     ActorRel(NonMatching, "d_a_midna"),
-    ActorRel(NonMatching, "d_a_nbomb"),
+    ActorRel(Equivalent, "d_a_nbomb"),
     ActorRel(NonMatching, "d_a_obj_life_container"),
     ActorRel(NonMatching, "d_a_obj_yousei"),
     ActorRel(NonMatching, "d_a_spinner"),
@@ -1452,7 +1452,7 @@ def MatchingFor(*versions):
     ActorRel(Matching, "d_a_obj_eff"),
     ActorRel(NonMatching, "d_a_obj_fmobj"),
     ActorRel(NonMatching, "d_a_obj_gpTaru"),
-    ActorRel(NonMatching, "d_a_obj_hhashi"),
+    ActorRel(Matching, "d_a_obj_hhashi"),
     ActorRel(NonMatching, "d_a_obj_kanban2"),
     ActorRel(NonMatching, "d_a_obj_kbacket"),
     ActorRel(Matching, "d_a_obj_kgate"),
@@ -1520,14 +1520,14 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_coach_fire"),
     ActorRel(NonMatching, "d_a_cow"),
     ActorRel(NonMatching, "d_a_cstatue"),
-    ActorRel(NonMatching, "d_a_do"),
+    ActorRel(Equivalent, "d_a_do"),
     ActorRel(Matching, "d_a_door_boss"),
     ActorRel(Matching, "d_a_door_bossL5"),
-    ActorRel(NonMatching, "d_a_door_mbossL1"),
+    ActorRel(Equivalent, "d_a_door_mbossL1"),
     ActorRel(Matching, "d_a_door_push"),
     ActorRel(NonMatching, "d_a_e_ai"),
     ActorRel(Matching, "d_a_e_arrow"),
-    ActorRel(NonMatching, "d_a_e_ba"),
+    ActorRel(Equivalent, "d_a_e_ba"),
     ActorRel(NonMatching, "d_a_e_bee"),
     ActorRel(NonMatching, "d_a_e_bg"),
     ActorRel(NonMatching, "d_a_e_bi"),
@@ -1546,7 +1546,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_e_fb"),
     ActorRel(NonMatching, "d_a_e_fk"),
     ActorRel(NonMatching, "d_a_e_fs"),
-    ActorRel(NonMatching, "d_a_e_fz"),
+    ActorRel(Equivalent, "d_a_e_fz"),
     ActorRel(NonMatching, "d_a_e_gb"),
     ActorRel(NonMatching, "d_a_e_ge"),
     ActorRel(NonMatching, "d_a_e_gi"),
@@ -1607,7 +1607,7 @@ def MatchingFor(*versions):
     ActorRel(Matching, "d_a_e_yd_leaf"),
     ActorRel(NonMatching, "d_a_e_yg"),
     ActorRel(NonMatching, "d_a_e_yh"),
-    ActorRel(NonMatching, "d_a_e_yk"),
+    ActorRel(Equivalent, "d_a_e_yk"),
     ActorRel(NonMatching, "d_a_e_ym"),
     ActorRel(Matching, "d_a_e_ym_tag"),
     ActorRel(NonMatching, "d_a_e_ymb"),
@@ -1628,7 +1628,7 @@ def MatchingFor(*versions):
     ActorRel(Matching, "d_a_kytag07"),
     ActorRel(Matching, "d_a_kytag08"),
     ActorRel(Matching, "d_a_kytag09"),
-    ActorRel(NonMatching, "d_a_kytag12"),
+    ActorRel(Matching, "d_a_kytag12"),
     ActorRel(NonMatching, "d_a_kytag13"),
     ActorRel(Matching, "d_a_kytag15"),
     ActorRel(Matching, "d_a_kytag16"),
@@ -2054,7 +2054,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_obj_zdoor"),
     ActorRel(NonMatching, "d_a_obj_zrTurara"),
     ActorRel(Matching, "d_a_obj_zrTuraraRock"),
-    ActorRel(NonMatching, "d_a_obj_zraMark"),
+    ActorRel(Equivalent, "d_a_obj_zraMark"),
     ActorRel(Matching, "d_a_obj_zra_freeze"),
     ActorRel(NonMatching, "d_a_obj_zra_rock"),
     ActorRel(NonMatching, "d_a_passer_mng"),

diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -151,12 +151,8 @@ class J2DAnmTransform : public J2DAnmBase {
         mTranslateValues = pTranslateValues;
         mKind = KIND_TRANSFORM;
     }
-    #ifdef __dt__15J2DAnmTransformFv_DEFINED
-    /* 80184370 */ virtual ~J2DAnmTransform();
-    #else
     /* 80184370 */ virtual ~J2DAnmTransform() {}
-    #endif
-    /* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const;
+    /* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const; // {} (should be inline)
 
     /* 0x10 */ f32* mScaleValues;
     /* 0x14 */ s16* mRotationValues;

diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h
@@ -88,13 +88,19 @@ class J2DPane {
     /* vt 0x20 */ virtual void setCullBack(_GXCullMode cmode);
     /* vt 0x24 */ virtual void setAlpha(u8);
     /* vt 0x28 */ virtual bool setConnectParent(bool connected);
-    /* vt 0x2C */ virtual void calcMtx();
+    /* vt 0x2C */ virtual void calcMtx() {
+        if (mPaneTree.getParent() != NULL) {
+            makeMatrix(mTranslateX, mTranslateY);
+        }
+    }
     /* vt 0x30 */ virtual void update();
     /* vt 0x34 */ virtual void drawSelf(f32 arg1, f32 arg2);
     /* vt 0x38 */ virtual void drawSelf(f32 arg1, f32 arg2, Mtx* mtx);
     /* vt 0x3C */ virtual J2DPane* search(u64 tag);
     /* vt 0x40 */ virtual J2DPane* searchUserInfo(u64 tag);
-    /* vt 0x44 */ virtual void makeMatrix(f32, f32);
+    /* vt 0x44 */ virtual void makeMatrix(f32 a, f32 b) {
+        makeMatrix(a, b, -mBounds.i.x, -mBounds.i.y);
+    }
     /* vt 0x48 */ virtual void makeMatrix(f32 a, f32 b, f32 c, f32 d);
     /* vt 0x4C */ virtual bool isUsed(const ResTIMG* timg);
     /* vt 0x50 */ virtual bool isUsed(const ResFONT* font);

diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
@@ -106,9 +106,19 @@ class J2DPicture : public J2DPane {
     /* 802FDAC8 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
     /* 800539DC */ virtual JUTTexture* getTexture(u8) const;
     /* 802FF634 */ virtual u8 getTextureCount() const;
-    /* 80053C6C */ virtual bool setBlack(JUtility::TColor);
-    /* 80053C44 */ virtual bool setWhite(JUtility::TColor);
-    /* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white);
+    /* 80053C6C */ virtual bool setBlack(JUtility::TColor i_black) {
+        mBlack = i_black;
+        return true;
+    }
+    /* 80053C44 */ virtual bool setWhite(JUtility::TColor i_white) {
+        mWhite = i_white;
+        return true;
+    }
+    /* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white) {
+        mBlack = i_black;
+        mWhite = i_white;
+        return true;
+    }
     /* 801DFA4C */ virtual JUtility::TColor getBlack() const;
     /* 801DFA40 */ virtual JUtility::TColor getWhite() const;
     /* 8025603C */ virtual J2DMaterial* getMaterial() const { return NULL; }

diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h
@@ -55,7 +55,7 @@ class J2DScreen : public J2DPane {
     /* 802F90E0 */ virtual J2DPane* searchUserInfo(u64);
     /* 802F9600 */ virtual bool isUsed(ResTIMG const*);
     /* 802F9620 */ virtual bool isUsed(ResFONT const*);
-    /* 80053BA0 */ virtual void clearAnmTransform();
+    /* 80053BA0 */ virtual void clearAnmTransform() { J2DPane::clearAnmTransform(); }
     /* 802F9704 */ virtual void setAnimation(J2DAnmColor*);
     /* 80192414 */ virtual void setAnimation(J2DAnmTransform* i_bck) { J2DPane::setAnimation(i_bck); }
     /* 802F9798 */ virtual void setAnimation(J2DAnmTextureSRTKey*);

diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h
@@ -75,7 +75,7 @@ class J2DTextBox : public J2DPane {
     /* 80300278 */ virtual void setFont(JUTFont*);
     /* 8021C7F4 */ virtual JUTFont* getFont() const { return mFont; }
     /* 80254408 */ virtual bool setBlack(JUtility::TColor);
-    /* 80186C84 */ virtual bool setWhite(JUtility::TColor);
+    /* 80186C84 */ virtual bool setWhite(JUtility::TColor white) { mWhiteColor = white; return true; }
     /* 8019230C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
     /* 801DFA34 */ virtual JUtility::TColor getBlack() const;
     /* 801DFA28 */ virtual JUtility::TColor getWhite() const;