From a30934f29c5d4af882bf6016ae8fce0c4f47045b Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Sun, 27 Sep 2026 02:11:31 -0400 Subject: [PATCH 01/10] System/MarNameRefGen_BossEnemy: construct Boss Pakkun variants --- src/System/MarNameRefGen_BossEnemy.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/System/MarNameRefGen_BossEnemy.cpp b/src/System/MarNameRefGen_BossEnemy.cpp index 87c7ccf99..89d33d23f 100644 --- a/src/System/MarNameRefGen_BossEnemy.cpp +++ b/src/System/MarNameRefGen_BossEnemy.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -130,21 +131,17 @@ JDrama::TNameRef* TMarNameRefGen::getNameRef_BossEnemy(const char* name) const // if ( strcmp( name, "BossWanwanManager" ) == 0 ) // return new TBossWanwanManager("ボスワンワンマネージャ"); - // TODO: - // if ( strcmp( name, "BossPakkun" ) == 0 ) - // return new TBossPakkun("ボスパックン改"); + if (strcmp(name, "BossPakkun") == 0) + return new TBossPakkun("ボスパックン改"); - // TODO: - // if ( strcmp( name, "KBossPakkun" ) == 0 ) - // return new TBossPakkun("ボスパックン軽"); + if (strcmp(name, "KBossPakkun") == 0) + return new TBossPakkun("ボスパックン軽"); - // TODO: - // if ( strcmp( name, "BossPakkunManager" ) == 0 ) - // return new TBossPakkunManager("ボスパックンマネージャー", 0); + if (strcmp(name, "BossPakkunManager") == 0) + return new TBossPakkunManager("ボスパックンマネージャー", 0); - // TODO: - // if ( strcmp( name, "KBossPakkunManager" ) == 0 ) - // return new TBossPakkunManager("ボスパックン軽マネージャ", 1); + if (strcmp(name, "KBossPakkunManager") == 0) + return new TBossPakkunManager("ボスパックン軽マネージャ", 1); // TODO: // if ( strcmp( name, "BossTelesa" ) == 0 ) From c1ce7edb1b2e121ac92e12a7f851fc37dbfc5c0a Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Sun, 27 Sep 2026 03:01:33 -0400 Subject: [PATCH 02/10] Camera/CameraMapTool: store pitch and yaw as angles --- include/Camera/CameraMapTool.hpp | 11 +++++++---- src/Camera/CameraMapTool.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/Camera/CameraMapTool.hpp b/include/Camera/CameraMapTool.hpp index fbe637738..2ee827d57 100644 --- a/include/Camera/CameraMapTool.hpp +++ b/include/Camera/CameraMapTool.hpp @@ -5,10 +5,13 @@ #include #include -// TODO: the fields of this class are most definitely incorrect because of how -// it behaves sinside of a TVector. See InsertRaw for it in MarNameRefGen. class TCameraMapTool : public JDrama::TNameRef { public: + struct TPitchYaw { + f32 pitch; + f32 yaw; + }; + TCameraMapTool(const char* name = "") : JDrama::TNameRef(name) { @@ -18,13 +21,13 @@ class TCameraMapTool : public JDrama::TNameRef { void load(JSUMemoryInputStream&); // Fabricated - f32 getYaw() const { return mPitchYaw.y; } + f32 getYaw() const { return mPitchYaw.yaw; } int getCameraMode() const { return mCameraMode; } int getDemoLengthFrames() const { return mDemoLengthFrames; } public: /* 0xC */ JGeometry::TVec3 mPosition; - /* 0x18 */ JGeometry::TVec2 mPitchYaw; + /* 0x18 */ TPitchYaw mPitchYaw; /* 0x20 */ u32 unk20; /* 0x24 */ s32 mCameraMode; /* 0x28 */ s32 unk28; diff --git a/src/Camera/CameraMapTool.cpp b/src/Camera/CameraMapTool.cpp index da6b9a1c3..097901d37 100644 --- a/src/Camera/CameraMapTool.cpp +++ b/src/Camera/CameraMapTool.cpp @@ -8,8 +8,8 @@ void TCameraMapTool::load(JSUMemoryInputStream& stream) { JDrama::TNameRef::load(stream); - stream >> mPosition.x >> mPosition.y >> mPosition.z >> mPitchYaw.x - >> mPitchYaw.y; + stream >> mPosition.x >> mPosition.y >> mPosition.z >> mPitchYaw.pitch + >> mPitchYaw.yaw; stream >> unk20; stream >> mCameraMode; @@ -26,8 +26,8 @@ void TCameraMapTool::calcPosAndAt(JGeometry::TVec3* pos, pos->set(mPosition); if (gpCamera->isFixCameraSpecifyMode(mCameraMode)) { - CLBPolarToCross(*pos, at, 1000.0f, CLBDegToShortAngle(-mPitchYaw.x), - CLBDegToShortAngle(mPitchYaw.y)); + CLBPolarToCross(*pos, at, 1000.0f, CLBDegToShortAngle(-mPitchYaw.pitch), + CLBDegToShortAngle(mPitchYaw.yaw)); } else { at->set(gpCamera->getUsualLookat()); } From f13313cef00cf25243739f453527c7cb6b21ce6e Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Sun, 27 Sep 2026 03:17:26 -0400 Subject: [PATCH 03/10] System: restore enemy factories and tree defaults --- src/System/MarNameRefGen_Enemy.cpp | 71 ++++++++++++++++------------- src/System/MarNameRefGen_MapObj.cpp | 2 +- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/src/System/MarNameRefGen_Enemy.cpp b/src/System/MarNameRefGen_Enemy.cpp index 25caeeb3c..28dd4bed4 100644 --- a/src/System/MarNameRefGen_Enemy.cpp +++ b/src/System/MarNameRefGen_Enemy.cpp @@ -23,11 +23,28 @@ #include #include #include +#include #include #include #include #include +class THamuKuriLauncherManager : public TLauncherManager { +public: + THamuKuriLauncherManager(const char* name) + : TLauncherManager(name) + { + } +}; + +class TNameKuriLauncherManager : public TLauncherManager { +public: + TNameKuriLauncherManager(const char* name) + : TLauncherManager(name) + { + } +}; + JDrama::TNameRef* TMarNameRefGen::getNameRef_Enemy(const char* name) const { @@ -69,7 +86,7 @@ JDrama::TNameRef* TMarNameRefGen::getNameRef_Enemy(const char* name) const // return new TFruitsBoatManager(3, "フルーツの船マネージャー"); if (strcmp(name, "AnimalMew") == 0) - return new TAnimalBase(0x80001); + return new TAnimalBase(0x800001, "?"); if (strcmp(name, "MewManager") == 0) return new TMewManager; @@ -306,7 +323,7 @@ JDrama::TNameRef* TMarNameRefGen::getNameRef_Enemy(const char* name) const return new TPoiHana; if (strcmp(name, "PoiHanaRed") == 0) - return new TPoiHana; + return new TPoiHanaRed; if (strcmp(name, "SleepPoiHana") == 0) return new TSleepPoiHana; @@ -321,37 +338,29 @@ JDrama::TNameRef* TMarNameRefGen::getNameRef_Enemy(const char* name) const if (strcmp(name, "FireWanwan") == 0) return new TFireWanwan; - // TODO: - // if ( strcmp(name, "TobiPukuLaunchPadManager") == 0) - // return new TTobiPukuLaunchPadManager; + if (strcmp(name, "TobiPukuLaunchPadManager") == 0) + return new TTobiPukuLaunchPadManager("とびプク発射台マネージャー"); - // TODO: - // if ( strcmp(name, "TobiPukuLaunchPad") == 0) - // return new TTobiPukuLaunchPad; + if (strcmp(name, "TobiPukuLaunchPad") == 0) + return new TTobiPukuLaunchPad("とびプク発射台"); - // TODO: - // if ( strcmp(name, "MoePukuLaunchPadManager") == 0) - // return new TTobiPukuLaunchPadManager; + if (strcmp(name, "MoePukuLaunchPadManager") == 0) + return new TMoePukuLaunchPadManager; - // TODO: - // if ( strcmp(name, "MoePukuLaunchPad") == 0) - // return new TTobiPukuLaunchPad; + if (strcmp(name, "MoePukuLaunchPad") == 0) + return new TMoePukuLaunchPad; - // TODO: - // if ( strcmp(name, "TobiPukuManager") == 0) - // return new TTobiPukuManager; + if (strcmp(name, "TobiPukuManager") == 0) + return new TTobiPukuManager("とびプクマネージャー"); - // TODO: - // if ( strcmp(name, "MoePukuManager") == 0) - // return new TTobiPukuManager; + if (strcmp(name, "MoePukuManager") == 0) + return new TMoePukuManager; - // TODO: - // if ( strcmp(name, "PukuPuku") == 0) - // return new TPukuPuku; + if (strcmp(name, "PukuPuku") == 0) + return new TPukuPuku("プクプク"); - // TODO: - // if ( strcmp( name, "MoePuku" ) == 0 ) - // return new TTobiPuku; + if (strcmp(name, "MoePuku") == 0) + return new TMoePuku; // TODO: // if ( strcmp(name, "TabePukuManager") == 0) @@ -441,16 +450,14 @@ JDrama::TNameRef* TMarNameRefGen::getNameRef_Enemy(const char* name) const if (strcmp(name, "HamukuriLauncher") == 0) return new THamuKuriLauncher; - // TODO: - // if (strcmp(name, "HamukuriLauncherManager") == 0) - // return new THamukuriLauncherManager("ハムクリランチャーマネージャー"); + if (strcmp(name, "HamukuriLauncherManager") == 0) + return new THamuKuriLauncherManager("ハムクリランチャーマネージャー"); if (strcmp(name, "NamekuriLauncher") == 0) return new TNameKuriLauncher; - // TODO: - // if (strcmp(name, "NamekuriLauncherManager") == 0) - // return new TNamekuriLauncherManager("ナメクリランチャーマネージャー"); + if (strcmp(name, "NamekuriLauncherManager") == 0) + return new TNameKuriLauncherManager("ナメクリランチャーマネージャー"); if (strcmp(name, "IgaigaManager") == 0) return new TIgaigaManager; diff --git a/src/System/MarNameRefGen_MapObj.cpp b/src/System/MarNameRefGen_MapObj.cpp index 571ce2468..432de4f39 100644 --- a/src/System/MarNameRefGen_MapObj.cpp +++ b/src/System/MarNameRefGen_MapObj.cpp @@ -220,7 +220,7 @@ JDrama::TNameRef* TMarNameRefGen::getNameRef_MapObj(const char* name) const return new TMapObjTree; if (strcmp(name, "PalmNatume") == 0) - return new TMapObjTree("地形オブジェ基底"); + return new TMapObjTree; if (strcmp(name, "FruitTree") == 0) return new TMapObjBase; From 435c199c296568d1fe3fc6798266fb61b1998b25 Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Sun, 27 Sep 2026 11:07:31 -0400 Subject: [PATCH 04/10] System/CardManager: initialize criteria and close option files --- src/System/CardManager.cpp | 45 +++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/src/System/CardManager.cpp b/src/System/CardManager.cpp index 23b195f95..fc3171408 100644 --- a/src/System/CardManager.cpp +++ b/src/System/CardManager.cpp @@ -97,23 +97,21 @@ s32 TCardSector::read(CARDFileInfo* file, s32 index, void TCardManager::TCriteria::set(TCardManager::TCriteria::TEBlockStat state, u32 write_count, const void* sector_data) { - (void)0; - (void)0; mState = state; if (mState == STATE_VALID) { mWriteCount = write_count; memcpy(&mPreviewBytes, sector_data, sizeof(mPreviewBytes)); - } else { - setEmpty(); + } else if (mState == STATE_EMPTY) { + mWriteCount = 0; + memset(mPreviewBytes, 0, sizeof(mPreviewBytes)); } } void TCardManager::TCriteria::setEmpty() { - if (mState == STATE_EMPTY) { - mWriteCount = 0; - memset(mPreviewBytes, 0, sizeof(mPreviewBytes)); - } + mState = STATE_EMPTY; + mWriteCount = 0; + memset(mPreviewBytes, 0, sizeof(mPreviewBytes)); } #pragma dont_inline on @@ -137,8 +135,22 @@ s32 TCardManager::decideUseSector(TCardManager::TCriteria* criteria) } #pragma dont_inline off -// TODO: what is this? -s32 TCardManager::getLoadIndex(TCardManager::TCriteria* criteria) { } +s32 TCardManager::getLoadIndex(TCardManager::TCriteria* criteria) +{ + s32 index = -1; + int sector = decideUseSector(criteria); + switch (sector) { + case 0: + index = 0; + break; + case 1: + index = 1; + break; + default: + break; + } + return index; +} s32 TCardManager::getWriteCount(TCardManager::TCriteria* criteria) { @@ -650,16 +662,15 @@ s32 TCardManager::readOptionBlock_() s32 result = open_(&info); if (result == CARD_RESULT_READY) { TCardSector* sector = (TCardSector*)mSector; - if (mSectorCriteria[0].mState == TCriteria::STATE_EMPTY) { sector->clearData(); sector->setCheckSum(0); } else { - result = sector->read(&info, 0, &mSectorCriteria[0]); - s32 errc = CARDClose(&info); - if (result == CARD_RESULT_READY) - result = errc; + result = sector->read(&info, 0, &mSectorCriteria[0]); } + s32 errc = CARDClose(&info); + if (result == CARD_RESULT_READY) + result = errc; } return result; @@ -734,9 +745,7 @@ s32 TCardManager::writeCardSector_(CARDFileInfo* file, s32 index, if (errc != CARD_RESULT_READY) return errc; - errc = sector->read(file, index, criteria); - - return errc; + return sector->read(file, index, criteria); } s32 TCardManager::cmdLoop() From 187b75298b6c2de22688d92cab472e430bde4d8f Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Sun, 27 Sep 2026 11:41:28 -0400 Subject: [PATCH 05/10] System/CardManager: preserve option read flow --- src/System/CardManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/System/CardManager.cpp b/src/System/CardManager.cpp index fc3171408..0e9b7d25a 100644 --- a/src/System/CardManager.cpp +++ b/src/System/CardManager.cpp @@ -666,11 +666,11 @@ s32 TCardManager::readOptionBlock_() sector->clearData(); sector->setCheckSum(0); } else { - result = sector->read(&info, 0, &mSectorCriteria[0]); + result = sector->read(&info, 0, &mSectorCriteria[0]); + s32 errc = CARDClose(&info); + if (result == CARD_RESULT_READY) + result = errc; } - s32 errc = CARDClose(&info); - if (result == CARD_RESULT_READY) - result = errc; } return result; From ff937550a444014b849334665a17addfedc2aa6a Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Sun, 27 Sep 2026 11:44:17 -0400 Subject: [PATCH 06/10] System/MarDirectorEvent: select the retail shine camera --- src/System/MarDirectorEvent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/System/MarDirectorEvent.cpp b/src/System/MarDirectorEvent.cpp index c4fea5430..7492b20aa 100644 --- a/src/System/MarDirectorEvent.cpp +++ b/src/System/MarDirectorEvent.cpp @@ -141,8 +141,8 @@ void TMarDirector::fireGetStar(TShine* shine) unk25C = shine; onFlag(DIRECTOR_FLAG_SHINE_GET_PENDING); JGeometry::TVec3& v = shine->mInitialRotation; - fireStartDemoCamera(!shine->unk190 ? cCameraBckNameShineGetInside - : cCameraBckNameShineGetOutside, + fireStartDemoCamera(!shine->unk190 ? cCameraBckNameShineGetOutside + : cCameraBckNameShineGetInside, &gpMarioOriginal->mPosition, -1, v.y, false, nullptr, 0, nullptr, JDrama::TFlagT(0)); } From f54076a9174c374a41d336cd0643cb0675b62eb4 Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Sun, 27 Sep 2026 11:51:31 -0400 Subject: [PATCH 07/10] System/EmitterViewObj: use particle identity and selected color --- src/System/EmitterViewObj.cpp | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/System/EmitterViewObj.cpp b/src/System/EmitterViewObj.cpp index 037fcc77c..867f4d17a 100644 --- a/src/System/EmitterViewObj.cpp +++ b/src/System/EmitterViewObj.cpp @@ -485,14 +485,14 @@ JPABaseEmitter* TMarioParticleManager::emitParticleCallBack( { if (param_3 == 1) { int type = param_1 - 253; - int idx = getAvailableIdx(type, param_3, param_4); + int idx = getAvailableIdx(type, param_3, param_5); TInfo* info = &unk10[type][idx]; info->onFlag(INFO_FLAG_UNK4); info->offFlag(INFO_FLAG_BIND_TO_POS); info->offFlag(INFO_FLAG_BIND_TO_RT_MTX); info->offFlag(INFO_FLAG_BIND_TO_SRT_MTX); info->unk4 = param_2; - info->unk0 = param_4; + info->unk0 = param_5; if (info->mEmitter == nullptr) emitTry(param_1, info, param_3); if (info->mEmitter != nullptr) { @@ -503,14 +503,14 @@ JPABaseEmitter* TMarioParticleManager::emitParticleCallBack( if (param_3 == 3) { int type = param_1 - 486; - int idx = getAvailableIdx(type, param_3, param_4); + int idx = getAvailableIdx(type, param_3, param_5); TInfo* info = &unk368[type][idx]; info->onFlag(INFO_FLAG_UNK4); info->offFlag(INFO_FLAG_BIND_TO_POS); info->offFlag(INFO_FLAG_BIND_TO_RT_MTX); info->offFlag(INFO_FLAG_BIND_TO_SRT_MTX); info->unk4 = param_2; - info->unk0 = param_4; + info->unk0 = param_5; if (info->mEmitter == nullptr) emitTry(param_1, info, param_3); if (info->mEmitter != nullptr) { @@ -601,45 +601,43 @@ void SMSSetEmitterPolColor(JPABaseEmitter* param_1, int param_2) if (param_2 < 0 || param_2 > 7) return; - int value; - if (param_2 == 6) { switch (gpMarDirector->mMap) { case 1: if (gpMarDirector->unk7D == 5) { - value = 3; + param_2 = 3; break; } // FALLTHROUGH case 2: case 55: - value = 2; + param_2 = 2; break; case 9: case 0: case 57: - value = 1; + param_2 = 1; break; case 3: - value = 3; + param_2 = 3; break; case 8: - value = 4; + param_2 = 4; break; case 6: case 7: case 14: case 56: - value = 5; + param_2 = 5; break; default: - value = 0; + param_2 = 0; break; } } @@ -656,9 +654,9 @@ void SMSSetEmitterPolColor(JPABaseEmitter* param_1, int param_2) { 0xB7, 0x24, 0x08, 0xFF }, { 0x00, 0x73, 0x6C, 0xFF }, }; - param_1->setGlobalPrmColor(prmarray[value].r, prmarray[value].g, - prmarray[value].b); + param_1->setGlobalPrmColor(prmarray[param_2].r, prmarray[param_2].g, + prmarray[param_2].b); - param_1->setGlobalEnvColor(envarray[value].r, envarray[value].g, - envarray[value].b); + param_1->setGlobalEnvColor(envarray[param_2].r, envarray[param_2].g, + envarray[param_2].b); } From 9c4b37f75656c2216d6a1152fe1531f711ebaf36 Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Sun, 27 Sep 2026 11:51:31 -0400 Subject: [PATCH 08/10] System/MenuDir: load default wave on first setup --- src/System/MenuDir.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/System/MenuDir.cpp b/src/System/MenuDir.cpp index 031e43563..5029eb997 100644 --- a/src/System/MenuDir.cpp +++ b/src/System/MenuDir.cpp @@ -172,9 +172,9 @@ int TMenuDirector::direct() void* res; OSJoinThread(&gSetupThread, &res); SMSGetApplication()->getFader()->startFadeinT(0.25f); - if (TFlagManager::getInstance()->getBool(0x30007)) { + if (!TFlagManager::getInstance()->getBool(0x30007)) { TFlagManager::getInstance()->setBool(true, 0x30007); - gpMSound->loadWave(MS_WAVE_UNK128); + SMSGetMSound()->loadWave(MS_WAVE_DEFAULT); } unk50 = true; } @@ -331,7 +331,7 @@ int TMenuDirector::direct() case 2: if (SMSGetApplication()->getFader()->isFullyFadedOut() - && gpMSound->checkWaveOnAram(MS_WAVE_UNK128)) { + && SMSGetMSound()->checkWaveOnAram(MS_WAVE_DEFAULT)) { if (unk40->unk2C == 0x11 || unk40->unk2C == 0x12) uVar13 = TApplication::APP_STATE_MOVIE; else From b82434ed27d164991b70f74b50535f40fcc1fbf8 Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Sun, 27 Sep 2026 12:35:38 -0400 Subject: [PATCH 09/10] System/EventWatcher: construct transform vectors in source order --- src/System/EventWatcher.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/System/EventWatcher.cpp b/src/System/EventWatcher.cpp index f9c965c68..a3be31590 100644 --- a/src/System/EventWatcher.cpp +++ b/src/System/EventWatcher.cpp @@ -1008,9 +1008,10 @@ static void evSetTransScale(TSpcTypedInterp* interp, u32 arg_num) TMapObjBase* obj = (TMapObjBase*)getNameRefPtr(interp->pop()); obj->makeObjAppeared(); - obj->changeObjSRT(JGeometry::TVec3(sx, sy, sz), - JGeometry::TVec3(0.0f, 0.0f, 0.0f), - JGeometry::TVec3(tx, ty, tz)); + JGeometry::TVec3 scale(sx, sy, sz); + JGeometry::TVec3 rot(0.0f, 0.0f, 0.0f); + JGeometry::TVec3 trans(tx, ty, tz); + obj->changeObjSRT(scale, rot, trans); interp->push(); } From 482f6b372224dcfdbcd9477cd01b24712440ccbd Mon Sep 17 00:00:00 2001 From: KakarotCake <61133727+KakarottoCake@users.noreply.github.com> Date: Mon, 28 Sep 2026 09:55:03 -0400 Subject: [PATCH 10/10] Address System review comments --- include/Enemy/HamuKuri.hpp | 8 ++++++++ include/Enemy/NameKuri.hpp | 8 ++++++++ src/System/CardManager.cpp | 18 ++---------------- src/System/MarNameRefGen_Enemy.cpp | 16 ---------------- 4 files changed, 18 insertions(+), 32 deletions(-) diff --git a/include/Enemy/HamuKuri.hpp b/include/Enemy/HamuKuri.hpp index e6ef9152d..0f67dd6be 100644 --- a/include/Enemy/HamuKuri.hpp +++ b/include/Enemy/HamuKuri.hpp @@ -18,6 +18,14 @@ class THamuKuriLauncher : public TLauncher { virtual void stateLaunch(); }; +class THamuKuriLauncherManager : public TLauncherManager { +public: + THamuKuriLauncherManager(const char* name) + : TLauncherManager(name) + { + } +}; + // ============= params ============= class THamuKuriSaveLoadParams : public TWalkerEnemyParams { diff --git a/include/Enemy/NameKuri.hpp b/include/Enemy/NameKuri.hpp index e59a39ed5..1c3087cc0 100644 --- a/include/Enemy/NameKuri.hpp +++ b/include/Enemy/NameKuri.hpp @@ -19,6 +19,14 @@ class TNameKuriLauncher : public TLauncher { virtual void stateLaunch(); }; +class TNameKuriLauncherManager : public TLauncherManager { +public: + TNameKuriLauncherManager(const char* name) + : TLauncherManager(name) + { + } +}; + class TNameKuriSaveLoadParams : public TWalkerEnemyParams { public: TNameKuriSaveLoadParams(const char* path); diff --git a/src/System/CardManager.cpp b/src/System/CardManager.cpp index 0e9b7d25a..d0ff4fbc4 100644 --- a/src/System/CardManager.cpp +++ b/src/System/CardManager.cpp @@ -135,22 +135,8 @@ s32 TCardManager::decideUseSector(TCardManager::TCriteria* criteria) } #pragma dont_inline off -s32 TCardManager::getLoadIndex(TCardManager::TCriteria* criteria) -{ - s32 index = -1; - int sector = decideUseSector(criteria); - switch (sector) { - case 0: - index = 0; - break; - case 1: - index = 1; - break; - default: - break; - } - return index; -} +// TODO: what is this? +s32 TCardManager::getLoadIndex(TCardManager::TCriteria* criteria) { } s32 TCardManager::getWriteCount(TCardManager::TCriteria* criteria) { diff --git a/src/System/MarNameRefGen_Enemy.cpp b/src/System/MarNameRefGen_Enemy.cpp index 28dd4bed4..e35ac8c00 100644 --- a/src/System/MarNameRefGen_Enemy.cpp +++ b/src/System/MarNameRefGen_Enemy.cpp @@ -29,22 +29,6 @@ #include #include -class THamuKuriLauncherManager : public TLauncherManager { -public: - THamuKuriLauncherManager(const char* name) - : TLauncherManager(name) - { - } -}; - -class TNameKuriLauncherManager : public TLauncherManager { -public: - TNameKuriLauncherManager(const char* name) - : TLauncherManager(name) - { - } -}; - JDrama::TNameRef* TMarNameRefGen::getNameRef_Enemy(const char* name) const {