diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index cf274894..1b6259ed 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -17741,7 +17741,7 @@ __dt__14mDvd_command_cFv = .text:0x802EF0D0; // type:function size:0x60 __nw__14mDvd_command_cFUl = .text:0x802EF130; // type:function size:0xC __dl__14mDvd_command_cFPv = .text:0x802EF140; // type:function size:0x8 doClear__14mDvd_command_cFv = .text:0x802EF150; // type:function size:0x10 -done__14mDvd_command_cFv = .text:0x802EF160; // type:function size:0x4 +onComplete__14mDvd_command_cFv = .text:0x802EF160; // type:function size:0x4 waitDone__14mDvd_command_cFv = .text:0x802EF170; // type:function size:0x14 waitUntilDone__14mDvd_command_cFv = .text:0x802EF190; // type:function size:0x44 __ct__12mDvd_param_cFv = .text:0x802EF1E0; // type:function size:0x50 @@ -17787,7 +17787,7 @@ __dt__23mDvd_toMainRam_normal_cFv = .text:0x802F00B0; // type:function size:0x58 execute__23mDvd_toMainRam_normal_cFv = .text:0x802F0110; // type:function size:0xA0 onComplete__23mDvd_toMainRam_normal_cFv = .text:0x802F01B0; // type:function size:0x18 __dt__Q24mDvd10MyThread_cFv = .text:0x802F01D0; // type:function size:0x58 -__sinit_\m_dvd_cpp = .text:0x802F0230; // type:function size:0xE0 +__sinit_\m_dvd_cpp = .text:0x802F0230; // type:function size:0xE0 scope:local Construct__Q24mDvd41TUncompressInfo_cCFv = .text:0x802F0310; // type:function size:0x3C Destruct__Q24mDvd41TUncompressInfo_cCFv = .text:0x802F0350; // type:function size:0x4 Construct__Q24mDvd42TUncompressInfo_cCFv = .text:0x802F0360; // type:function size:0x40 @@ -39028,10 +39028,10 @@ lbl_80573FC8 = .sdata:0x80573FC8; // type:object size:0x8 data:4byte lbl_80573FD0 = .sdata:0x80573FD0; // type:object size:0x4 lbl_80573FD4 = .sdata:0x80573FD4; // type:object size:0x1 data:byte lbl_80573FD8 = .sdata:0x80573FD8; // type:object size:0x4 data:4byte -lbl_80573FDC = .sdata:0x80573FDC; // type:object size:0x8 +lbl_80573FDC = .sdata:0x80573FDC; // type:object size:0x5 data:string lbl_80573FE4 = .sdata:0x80573FE4; // type:object size:0x4 data:string lbl_80573FE8 = .sdata:0x80573FE8; // type:object size:0x4 data:string -lbl_80573FEC = .sdata:0x80573FEC; // type:object size:0x8 +lbl_80573FEC = .sdata:0x80573FEC; // type:object size:0x5 data:string lbl_80573FF4 = .sdata:0x80573FF4; // type:object size:0x4 data:string g_DefaultGameHeapId__5mHeap = .sdata:0x80573FF8; // type:object size:0x1 data:byte lbl_80574000 = .sdata:0x80574000; // type:object size:0x8 data:4byte diff --git a/include/m/m_dvd.h b/include/m/m_dvd.h index 50d82203..4fbb2809 100644 --- a/include/m/m_dvd.h +++ b/include/m/m_dvd.h @@ -59,7 +59,6 @@ public: virtual void onComplete(); void doClear(); - void done(); void waitDone(); void waitUntilDone(); static void destroy(mDvd_command_c **cmd); diff --git a/src/m/m_dvd.cpp b/src/m/m_dvd.cpp index 48718fe7..7aff42d9 100644 --- a/src/m/m_dvd.cpp +++ b/src/m/m_dvd.cpp @@ -193,7 +193,7 @@ void mDvd_command_c::doClear() { } /** 802ef170 */ -void mDvd_command_c::done() {} +void mDvd_command_c::onComplete() {} void mDvd_command_c::waitDone() { mStatus = 1;