Compare commits

...

1 Commits

Author SHA1 Message Date
Devin AI
88e7f0e008 memoryCard: emit MemoryBase vtable in base TU (orig key-function order)
Move MemoryBase's key function to the base TU: inline the destructor
(like every other MemoryBase class in the codebase) so MWCC emits
__vt__MemoryBase in iplMemoryCardBase.o, matching the original object
where the vtable + dtor live there. base.o .data reloc stream is now
byte-identical to the original object. Drops the OUT_OF_LINE dtor
indirection; keeps the IPA-outlined __dt__ + onMove defs in MC.cpp.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-09-30 18:44:13 +00:00
2 changed files with 3 additions and 7 deletions

View File

@@ -94,11 +94,9 @@ namespace ipl {
nw4r::ut::List_Init(&mAnmButtonList, offsetof(AnmButton, mLink));
}
#endif
#ifdef IPL_MEMORYCARD_BASE_OUT_OF_LINE
virtual ~MemoryBase();
#else
virtual ~MemoryBase() {}
#endif
virtual void onPoint(const char* paneName, controller::Interface* controller);
virtual void onLeft(const char* paneName);

View File

@@ -1,5 +1,4 @@
#define IPL_MEMORY_CARD_CPP
#define IPL_MEMORYCARD_BASE_OUT_OF_LINE
#define IPL_CHANNEL_TITLE_NOVTABLE
#include "scene/memoryCard/iplMemoryCard.h"
#undef IPL_CHANNEL_TITLE_NOVTABLE
@@ -90,8 +89,6 @@ namespace ipl {
nw4r::ut::List_Init(&mBalloonList, 0);
}
MemoryBase::~MemoryBase() {}
void MemoryCard::prepare() {
System::getBS2Manager()->abort();
unk_0x08 = System::getNandManager()->readLayoutAsync(getSceneHeap(), "gcMem.ash");
@@ -698,6 +695,7 @@ namespace ipl {
void MemoryBase::onMove(const char*) {}
MemoryCardManager::~MemoryCardManager() {}
MemoryCard::~MemoryCard() {}