Small d/lyt fix (#90)

zeldaret · Nov 6, 2024 · f509c05 · f509c05
1 parent 8a37108
commit f509c05
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
@@ -4771,7 +4771,7 @@ __dt__30sFStateFct_c<14dLytDobutton_c>Fv = .text:0x800D8EA0; // type:function si
 __dt__83sStateMgr_c<14dLytDobutton_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800D8F10; // type:function size:0xA0
 __dt__53sFStateMgr_c<14dLytDobutton_c,20sStateMethodUsr_FI_c>Fv = .text:0x800D8FB0; // type:function size:0xA4
 remove__20dLytMeterContainer_cFv = .text:0x800D9060; // type:function size:0x16C
-fn_800D91D0 = .text:0x800D91D0; // type:function size:0xE4
+__dt__14dLytDobutton_cFv = .text:0x800D91D0; // type:function size:0xE4
 fn_800D92C0 = .text:0x800D92C0; // type:function size:0x48
 fn_800D9310 = .text:0x800D9310; // type:function size:0xD8
 fn_800D93F0 = .text:0x800D93F0; // type:function size:0x1F0
@@ -4811,7 +4811,7 @@ getLyt__18dLytMeter2Button_cFv = .text:0x800DA520; // type:function size:0x8
 getPane__18dLytMeter2Button_cFv = .text:0x800DA530; // type:function size:0x8
 getName__18dLytMeter1Button_cCFv = .text:0x800DA540; // type:function size:0x8
 getLyt__18dLytMeter1Button_cFv = .text:0x800DA550; // type:function size:0x8
-__dt__14dLytDobutton_cFv = .text:0x800DA560; // type:function size:0x8
+getPane__18dLytMeter1Button_cFv = .text:0x800DA560; // type:function size:0x8
 changeState__89sStateMgr_c<20dLytMeterEventSkip_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x800DA570; // type:function size:0x10
 changeState__92sStateMgr_c<23dLytMeterGanbariGauge_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x800DA580; // type:function size:0x10
 changeState__84sStateMgr_c<15dLytMeterRupy_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x800DA590; // type:function size:0x10

diff --git a/include/d/lyt/d_lyt_do_button.h b/include/d/lyt/d_lyt_do_button.h
@@ -10,7 +10,9 @@ class dLytDobutton_c {
     dLytDobutton_c() : mStateMgr(*this, sStateID::null) {
         sInstance = this;
     }
-    virtual ~dLytDobutton_c() {}
+    virtual ~dLytDobutton_c() {
+        sInstance = nullptr;
+    }
 
     bool init(m2d::ResAccIf_c *resAcc);
     bool remove();