Compare commits

...

3 Commits

Author SHA1 Message Date
coah
0b4d8c0197 Revert "Link iplChannelTitle, iplController, iplSaveDataManager, eggAudioExpMgr (#225)"
This reverts commit 52977bb782.
2026-09-28 19:14:50 +00:00
coah
525009394c Revert "Link iplBoard + iplBoardObject as matching (#229)"
This reverts commit abf047bc3b.
2026-09-28 19:14:50 +00:00
coah
70892efdaa Revert "Link iplChannelSelect + fix channelTitle pad interaction (clean subset) (#230)"
This reverts commit 27844c37b3.
2026-09-28 19:14:50 +00:00
14 changed files with 1313 additions and 1574 deletions

View File

@@ -624,7 +624,7 @@ config.libs = [
Object(Matching, "system/rvl_dec.c"),
Object(Matching, "system/RIPL_BoardRecord.c"),
Object(Matching, "system/iplSystem.cpp"),
Object(Matching, "system/iplController.cpp"),
Object(NonMatching, "system/iplController.cpp"),
Object(Matching, "system/iplChannelManager.cpp"),
Object(Matching, "system/iplChannelScriptManager.cpp"),
Object(Matching, "system/iplNand.cpp"),
@@ -653,7 +653,7 @@ config.libs = [
Object(Matching, "system/iplWarningHandler.cpp"),
Object(Matching, "system/iplSocketSetting.cpp"),
Object(Matching, "system/iplPostmanManager.cpp"),
Object(Matching, "system/iplSaveDataManager.cpp"),
Object(NonMatching, "system/iplSaveDataManager.cpp"),
Object(Matching, "system/iplChannelRsoThread.cpp"),
Object(Matching, "system/RsoSystem.cpp"),
Object(Matching, "system/iplCdbBackup.cpp"),
@@ -737,8 +737,8 @@ config.libs = [
]
),
IPLSection("board", [
Object(Matching, "scene/board/iplBoard.cpp"),
Object(Matching, "scene/board/iplBoardObject.cpp"),
Object(Equivalent, "scene/board/iplBoard.cpp"),
Object(Equivalent, "scene/board/iplBoardObject.cpp"),
Object(Matching, "scene/board/iplBoardSD.cpp"),
Object(Matching, "scene/board/iplUrlProcessor.cpp"),
Object(Equivalent, "scene/board/iplFocusObject.cpp"),
@@ -765,13 +765,13 @@ config.libs = [
]
),
IPLSection("channelSelect", [
Object(Matching, "scene/channelSelect/iplChannelSelect.cpp"),
Object(Equivalent, "scene/channelSelect/iplChannelSelect.cpp"),
Object(Matching, "scene/channelSelect/iplClock.cpp"),
Object(Equivalent, "scene/channelSelect/iplChannelObj.cpp"),
]
),
IPLSection("channelTitle", [
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
Object(Equivalent, "scene/channelTitle/iplChannelTitle.cpp"),
]
),
IPLSection("faceSelect", [
@@ -1907,7 +1907,7 @@ config.libs = [
[
Object(Matching, "core/eggAllocator.cpp"),
Object(Matching, "core/eggAudioArcPlayerMgr.cpp"),
Object(Matching, "core/eggAudioExpMgr.cpp"),
Object(Equivalent, "core/eggAudioExpMgr.cpp"),
Object(Matching, "core/eggAudioFxMgr.cpp"),
Object(Matching, "core/eggAudioMgr.cpp"),
Object(Matching, "core/eggAudioHeapMgr.cpp"),

View File

@@ -55,14 +55,10 @@ namespace ipl {
x = r.x;
y = r.y;
}
#ifdef IPL_MATH_VEC2_CTOR_OUT_OF_LINE
VEC2(f32 fx, f32 fy);
#else
VEC2(f32 fx, f32 fy) {
x = fx;
y = fy;
}
#endif
void operator=(const VEC2& r);

View File

@@ -234,7 +234,6 @@ namespace ipl {
class ObjList {
public:
ObjList();
~ObjList() {}
BoardObject* getNext(BoardObject* obj = NULL) const { return (BoardObject*)nw4r::ut::List_GetNext((nw4r::ut::List*)&mUsedObjs, obj); }

View File

@@ -400,35 +400,20 @@ namespace ipl {
class ButtonEventHandlerBase : public ::gui::EventHandler {
public:
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual void onEvent(u32 compId, u32 event, void* data) {}
virtual void onEventDerived(u32 compId, u32 event, const controller::Interface* con) {}
#else
virtual void onEvent(u32 compId, u32 event, void* data);
virtual void onEventDerived(u32 compId, u32 event, const controller::Interface* con);
#endif
};
class OptOutButtonEventHandlerBase : public ButtonEventHandlerBase {
public:
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual void onEvent(u32 compId, u32 event, void* data) {}
virtual void onEventDerived(u32 compId, u32 event, const controller::Interface* con) {}
#else
virtual void onEvent(u32 compId, u32 event, void* data);
virtual void onEventDerived(u32 compId, u32 event, const controller::Interface* con);
#endif
};
class SDMenuEventHandlerBase : public ButtonEventHandlerBase {
public:
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual void onEvent(u32 compId, u32 event, void* data) {}
virtual void onEventDerived(u32 compId, u32 event, const controller::Interface* con) {}
#else
virtual void onEvent(u32 compId, u32 event, void* data);
virtual void onEventDerived(u32 compId, u32 event, const controller::Interface* con);
#endif
};
} // namespace scene
} // namespace ipl

View File

@@ -38,19 +38,6 @@ namespace EGG {
virtual void calc(); // 0x30
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x34
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x38
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x3C
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x48
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x50
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x50
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x58
#else
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x34
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x38
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName) NO_INLINE {
@@ -75,7 +62,6 @@ namespace EGG {
u32 id = changeNameToId(pName);
return mSoundArchivePlayer.HoldSound(pHandle, id);
} // 0x58
#endif
u32 changeNameToId(const char* pName) { return mpArchive->ConvertLabelStringToSoundId(pName); }
const char* changeIdToName(u32 id) { return mpArchive->GetSoundLabelString(id); }

View File

@@ -19,10 +19,6 @@ namespace EGG {
~SoundHeapMgr() { destroySoundHeap(); }
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
virtual bool loadState(s32 id); // 0x08
virtual s32 getCurrentLevel(); // 0x0C
#else
virtual bool loadState(s32 id) {
s32 level = mHeap.GetCurrentLevel();
@@ -35,7 +31,6 @@ namespace EGG {
} // 0x08
virtual s32 getCurrentLevel() { return mHeap.GetCurrentLevel(); } // 0x0C
#endif
s32 saveState() { return mHeap.SaveState(); }

View File

@@ -1,42 +1,30 @@
#define EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
#include <egg/core.h>
#undef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
namespace EGG {
// Declaring this unused subclass makes the @52@ adjustor thunks emit in the
// original order (@52@__dt__ before @52@calc). All of its emissions strip.
class Sample : public SimpleAudioMgrWithFx {
public:
Sample() : SimpleAudioMgrWithFx() {}
virtual ~Sample() {}
};
SimpleAudioMgrWithFx::SimpleAudioMgrWithFx() {
}
SimpleAudioMgrWithFx::~SimpleAudioMgrWithFx() {
}
SimpleAudioMgrWithFx::ArgWithFx::ArgWithFx() : fxArg() {
// auto generates constructors
SimpleAudioMgrArg unused0;
AudioFxMgr::AudioFxMgrArg unused1;
}
void SimpleAudioMgrWithFx::initialize(IAudioMgr::Arg* arg) {
SimpleAudioMgr::initialize(arg);
if (arg != NULL) {
arg = (IAudioMgr::Arg*)&((ArgWithFx*)arg)->fxArg;
SimpleAudioMgrWithFx::SimpleAudioMgrWithFx() {
}
initializeFx(&mHeap, (AudioFxMgrArg*)arg);
SimpleAudioMgrWithFx::~SimpleAudioMgrWithFx() {
}
setFxReverbHi(nw4r::snd::AUX_A, AudioFxMgr::getDefaultFxReverbHi());
setFxChorus(nw4r::snd::AUX_B, AudioFxMgr::getDefaultFxChorus());
SimpleAudioMgrWithFx::ArgWithFx::ArgWithFx() : fxArg() {
// auto generates constructors
SimpleAudioMgrArg unused0;
AudioFxMgr::AudioFxMgrArg unused1;
}
mHeap.SaveState();
}
void SimpleAudioMgrWithFx::initialize(IAudioMgr::Arg* arg) {
SimpleAudioMgr::initialize(arg);
if (arg != NULL) {
arg = (IAudioMgr::Arg*)&((ArgWithFx*)arg)->fxArg;
}
initializeFx(&mHeap, (AudioFxMgrArg*)arg);
setFxReverbHi(nw4r::snd::AUX_A, AudioFxMgr::getDefaultFxReverbHi());
setFxChorus(nw4r::snd::AUX_B, AudioFxMgr::getDefaultFxChorus());
mHeap.SaveState();
}
} // namespace EGG

View File

@@ -19,13 +19,8 @@ namespace nw4r {
template <typename T>
class AutoLock : private NonCopyable {
public:
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
explicit AutoLock(T& rLockObj);
~AutoLock();
#else
explicit AutoLock(T& rLockObj) : mLockObj(rLockObj) { Lock(rLockObj); }
~AutoLock() { Unlock(mLockObj); }
#endif
private:
T& mLockObj; // 0x00

View File

@@ -419,11 +419,11 @@ namespace ipl {
CDBRecordKey recordKey;
utility::Date recordDate;
u32 recordGC = 0;
int recordHour;
int recordMin;
int recordDay;
int recordMin;
int recordHour;
u32 recordGC = 0;
cdb::Manager* cdbManager = System::getCdbManager();
@@ -460,7 +460,7 @@ namespace ipl {
// Find any free space to put the object on screen
volatile BOOL old = OSDisableInterrupts();
BOOL old = OSDisableInterrupts();
BOOL exist = is_exist_diff_date();
BoardObject* obj = mObjList.getNextFree();
OSRestoreInterrupts(old);
@@ -468,7 +468,7 @@ namespace ipl {
if (obj == NULL && exist) {
while (obj == NULL) {
OSSleepMilliseconds((OSTime)1);
volatile BOOL old2 = OSDisableInterrupts();
BOOL old2 = OSDisableInterrupts();
obj = mObjList.getNextFree();
OSRestoreInterrupts(old2);
}
@@ -513,7 +513,7 @@ namespace ipl {
result = TRUE;
if (((RBRHeader*)rbrData)->magic == RBR_MAGIC && cdbManager->isValidHeader((RBRHeader*)rbrData)) {
volatile BOOL old3 = OSDisableInterrupts();
BOOL old3 = OSDisableInterrupts();
if (recordDate == mCurrentDate) {
if (mbReading == true && mSearchRecord_Prev.created) {

File diff suppressed because one or more lines are too long

View File

@@ -1,49 +1,3 @@
#include "layout/GUIManager.h"
#include "math/iplInterporation.h"
namespace ipl {
namespace math {
template <>
class HermiteIntp<f32> : public utility::FrameController {
public:
HermiteIntp() {}
virtual ~HermiteIntp() {}
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6,
int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
unkVal0 = param_5;
unkVal1 = param_6;
}
f32 get() const {
f32 var_f27 = mFrame;
f32 var_f28 = 1.0f / mMaxFrame;
f32 r =
(mStart *
(1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r += (unkVal0 * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
}
protected:
f32 mStart;
f32 mEnd;
f32 unkVal0;
f32 unkVal1;
};
} // namespace math
} // namespace ipl
#define IPL_CHANNEL_TITLE_NOVTABLE
#include <decomp/ide.h>
#include "iplSceneUI.h"
@@ -60,11 +14,6 @@ namespace ipl {
#include <cstring>
#pragma dont_instantiate ipl::math::HermiteIntp<float>
#undef IPL_CHANNEL_TITLE_NOVTABLE
// #pragma sym on
namespace ipl {
@@ -95,13 +44,16 @@ namespace ipl {
}
template <>
void HermiteIntp<VEC3>::init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 param_5, f32 param_6,
int playback, f32 speed) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
unkVal0 = param_5;
unkVal1 = param_6;
f32 HermiteIntp<f32>::get() const {
f32 var_f27 = mFrame;
f32 var_f28 = 1.0f / mMaxFrame;
f32 r = (mStart * (1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r += (unkVal0 * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
return r;
}
} // namespace math
} // namespace ipl
@@ -110,6 +62,7 @@ namespace ipl {
namespace scene {
extern "C" char smArg__Q23ipl6System;
extern "C" char sSystem__Q23ipl3snd;
extern "C" const double lbl_81694998;
extern "C" void* m_handle__Q23ipl11TVRCManager;
extern "C" void calcChanZoomParam__Q33ipl5scene13ChannelSelectFv();
extern "C" void setChanZoomOrtho__Q33ipl5scene13ChannelSelectFv();
@@ -142,9 +95,7 @@ namespace ipl {
extern "C" void initPane__Q33ipl3gui11PaneManagerFPQ34nw4r3lyt4Pane();
extern "C" void* jumptable_8164DD14[];
extern "C" void* jumptable_8164DE80[];
extern "C" void getCurrentChannel__Q33ipl7channel7ManagerFPiPi(int*, int*);
extern "C" int msCurPage__Q33ipl7channel7Manager;
extern "C" int msCurIndex__Q33ipl7channel7Manager;
extern "C" void getCurrentChannel__Q33ipl7channel7ManagerFPiPi();
extern "C" void calcNormalRestart__Q33ipl5scene13ChannelSelectFv();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
@@ -185,6 +136,7 @@ namespace ipl {
extern "C" char lbl_8164DFE1[];
extern "C" char lbl_8164DE64[];
extern "C" char lbl_8164DE6D[];
extern "C" char lbl_8164DE9C[];
extern "C" char lbl_8164DFCB[];
extern "C" char lbl_8164DFF1[];
extern "C" char lbl_8164E000[];
@@ -250,6 +202,20 @@ namespace ipl {
#pragma pop
#pragma push
#pragma section sconst_type ".sdata2"
extern "C" const f32 lbl_81694948;
extern "C" const u32 lbl_8169494C = 1;
extern "C" const f32 lbl_81694968;
extern "C" const f32 lbl_8169496C;
extern "C" const f32 lbl_81694970;
extern "C" const char lbl_81694950 = 0;
extern "C" const char lbl_81694951 = 0;
extern "C" const char lbl_81694952 = 0;
extern "C" const char lbl_81694953 = 255;
extern "C" const double lbl_81694998 = 4503601774854144.0;
#pragma pop
static Board* getBoard() {
return (Board*)System::getSceneManager()->getScene(SCENE_BOARD);
}
@@ -1099,15 +1065,6 @@ calcNormal_ChannelSelect_L20:
blr
}
extern "C" asm void getCurrentChannel__Q33ipl7channel7ManagerFPiPi(int*, int*) {
nofralloc
lwz r0, -0x59a4(r13)
stw r0, 0(r3)
lwz r0, -0x59a0(r13)
stw r0, 0(r4)
blr
}
void ChannelSelect::initCalcFadeout() {
}
@@ -1131,14 +1088,6 @@ calcNormal_ChannelSelect_L20:
return result;
}
#pragma push
#pragma section sconst_type ".sdata2"
extern "C" const char lbl_81694950 = 0;
extern "C" const char lbl_81694951 = 0;
extern "C" const char lbl_81694952 = 0;
extern "C" const char lbl_81694953 = 255;
#pragma pop
extern "C" asm void draw__Q33ipl5scene13ChannelSelectFv() {
nofralloc
stwu r1, -0x40(r1)
@@ -1781,7 +1730,7 @@ draw_ChannelSelect_L6:
if (isPageCreatedAllDone(mCurrentPage)) {
if (unkBool()) {
int page, index;
getCurrentChannel__Q33ipl7channel7ManagerFPiPi(&page, &index);
channel::Manager::getCurrentChannel(&page, &index);
reserveSceneChangeDerived(page, index);
mState = STATE_CHANNEL_TITLE;
}
@@ -1791,7 +1740,7 @@ draw_ChannelSelect_L6:
void ChannelSelect::calcNormalFadeOutZoom() {
// unused
int page, index;
getCurrentChannel__Q33ipl7channel7ManagerFPiPi(&page, &index);
channel::Manager::getCurrentChannel(&page, &index);
calcChanZoomParam();
setChanZoomOrtho();
@@ -2619,28 +2568,33 @@ calcNormalRestart_ChannelSelect_L7:
nw4r::ut::Rect projRect;
System::getProjectionRect(&projRect);
GXRenderModeObj* rMode = System::getRenderModeObj();
f32 var_f31;
f32 var_f30;
f32 var_f29;
f32 var_f30;
f32 var_f31;
f32 var_f1;
u16 var_r0;
u16 var_r3;
if (mState == STATE_NORMAL_FADE_ZOOM || mState == STATE_NORMAL_DONE_FADE_ZOOM || mState == STATE_NORMAL_RESTART) {
nw4r::math::MTX44 mtx;
f32 right = unk_0xD8.x + projRect.right / unk_0xE4.x;
f32 left = unk_0xD8.x + projRect.left / unk_0xE4.x;
f32 bottom = unk_0xD8.y - projRect.bottom / unk_0xE4.y;
f32 top = unk_0xD8.y - projRect.top / unk_0xE4.y;
f32 rightScale = projRect.right / unk_0xE4.x;
f32 leftScale = projRect.left / unk_0xE4.x;
f32 topScale = projRect.top / unk_0xE4.y;
f32 bottomScale = projRect.bottom / unk_0xE4.y;
f32 bottom = unk_0xD8.y - bottomScale;
f32 right = unk_0xD8.x + rightScale;
f32 left = unk_0xD8.x + leftScale;
f32 top = unk_0xD8.y - topScale;
MTXOrtho(mtx, top, bottom, left, right, -100.0f, 100.0f);
nw4r::math::VEC4 vec4_in(vec.x, vec.y, 0.0f, 1.0f);
nw4r::math::VEC4 vec4;
nw4r::math::VEC4Transform(&vec4, &mtx, &vec4_in);
var_r0 = rMode->fbWidth;
var_r3 = rMode->efbHeight;
f32 width = projRect.GetWidth();
var_f31 = ((1.0f + vec4.x) * var_r0 / 2) - ((mChanThumbOff_X * unk_0xE4.x) * (var_r0 / width));
var_f29 = projRect.GetWidth();
var_f30 = (var_r3 - ((1.0f + vec4.y) * var_r3 / 2)) - (mChanThumbOff_Y * unk_0xE4.y);
var_f29 = 2.0f * (mChanThumbOff_X * unk_0xE4.x) * (var_r0 / width);
f32 temp_f7_2 = var_r0 / var_f29;
var_f31 = ((1.0f + vec4.x) * var_r0 / 2) - ((mChanThumbOff_X * unk_0xE4.x) * (temp_f7_2));
var_f29 = 2.0f * (mChanThumbOff_X * unk_0xE4.x) * (var_r0 / var_f29);
var_f1 = 2.0f * (mChanThumbOff_Y * unk_0xE4.y);
} else {
var_r0 = rMode->fbWidth;
@@ -2864,8 +2818,8 @@ calcNormalRestart_ChannelSelect_L7:
if (mCurrentPage > 0 && unk_0x2B0 >= 15 && isPageCreatedAllDone(mCurrentPage)) {
if (unkBool()) {
button->animation(Button::IDANIM_ARROW_LEFT_SELECT);
mpLayout->setMinFrame(0.0f);
mpLayout->setMaxFrame(20.0f);
mpLayout->setMinFrame(lbl_81694948);
mpLayout->setMaxFrame(lbl_81694968);
mpLayout->setAnmType(ANIM_TYPE_FORWARD);
mpLayout->start();
@@ -2882,7 +2836,7 @@ calcNormalRestart_ChannelSelect_L7:
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
mpGui->initPane(getChannelBasePane(i));
}
snd::getSystem()->startSE("WSD_SELECT");
snd::getSystem()->startSE(lbl_8164DE9C);
return;
}
}
@@ -2890,8 +2844,8 @@ calcNormalRestart_ChannelSelect_L7:
if (mCurrentPage < mMaxPages - 1 && unk_0x2AC >= 15 && isPageCreatedAllDone(mCurrentPage)) {
if (unkBool()) {
button->animation(Button::IDANIM_ARROW_RIGHT_SELECT);
mpLayout->setMinFrame(40.0f);
mpLayout->setMaxFrame(60.0f);
mpLayout->setMinFrame(lbl_8169496C);
mpLayout->setMaxFrame(lbl_81694970);
mpLayout->setAnmType(ANIM_TYPE_FORWARD);
mpLayout->start();
@@ -2908,7 +2862,7 @@ calcNormalRestart_ChannelSelect_L7:
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
mpGui->initPane(getChannelBasePane(i));
}
snd::getSystem()->startSE("WSD_SELECT");
snd::getSystem()->startSE(lbl_8164DE9C);
return;
}
}
@@ -2991,14 +2945,60 @@ calcNormalRestart_ChannelSelect_L7:
}
}
void ChannelSelect::calcNormalMoveChanOut() {
if (!mpMoveLytMask->getAnim(1)->isPlaying() &&
!mpMoveLytObject->getAnim(1)->isPlaying() &&
!mpMoveLytDrop->getAnim(1)->isPlaying()) {
unk_0x2C8->setCurrentFrame(System::getRndm()->get_u16() % 2000);
restartChannelModules();
mState = STATE_NORMAL;
}
extern "C" asm void calcNormalMoveChanOut__Q33ipl5scene13ChannelSelectFv() {
nofralloc
stwu r1, -0x20(r1)
mflr r0
li r4, 0x1
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
mr r31, r3
lwz r5, 0xac(r3)
addi r3, r5, 0x28c
bl List_GetNth__Q24nw4r2utFPCQ34nw4r2ut4ListUs
lwz r0, 0x14(r3)
cmpwi r0, 0x1
beq calcNormalMoveChanOut_ChannelSelect_L1
lwz r3, 0xb0(r31)
li r4, 0x1
addi r3, r3, 0x28c
bl List_GetNth__Q24nw4r2utFPCQ34nw4r2ut4ListUs
lwz r0, 0x14(r3)
cmpwi r0, 0x1
beq calcNormalMoveChanOut_ChannelSelect_L1
lwz r3, 0xb4(r31)
li r4, 0x1
addi r3, r3, 0x28c
bl List_GetNth__Q24nw4r2utFPCQ34nw4r2ut4ListUs
lwz r0, 0x14(r3)
cmpwi r0, 0x1
beq calcNormalMoveChanOut_ChannelSelect_L1
bl getRndm__Q23ipl6SystemFv
bl get_u16__Q33ipl4math6RandomFv
clrlwi r7, r3, 16
li r6, 0x7d0
divw r5, r7, r6
lis r0, 0x4330
stw r0, 0x8(r1)
mr r3, r31
lfd f1, lbl_81694998
lwz r4, 0x2c8(r31)
mullw r0, r5, r6
subf r0, r0, r7
xoris r0, r0, 0x8000
stw r0, 0xc(r1)
lfd f0, 0x8(r1)
fsubs f0, f0, f1
stfs f0, 0xc(r4)
bl restartChannelModules__Q33ipl5scene13ChannelSelectFv
li r0, 0x1
stw r0, 0xc0(r31)
calcNormalMoveChanOut_ChannelSelect_L1:
lwz r0, 0x24(r1)
lwz r31, 0x1c(r1)
mtlr r0
addi r1, r1, 0x20
blr
}
void ChannelSelect::calcNormalDragScrl() {
@@ -3116,7 +3116,7 @@ calcNormalRestart_ChannelSelect_L7:
if (con->isValidDpd()) {
mDragPos = con->getDpdPos();
} else {
mDragPos = nw4r::math::VEC2(0.0f, 0.0f);
mDragPos = nw4r::math::VEC2(lbl_81694948, lbl_81694948);
}
mConChan = con->getChannel();
@@ -3379,19 +3379,6 @@ calcNormalRestart_ChannelSelect_L7:
math::VEC2 ForceCTORWeak() {
return math::VEC2(NULL, NULL);
}
// Stripped out function generated weak emits for dead data (dedup'd vtables).
void ForceVTableWeaks() {
utility::Tree::reverse_iterator deadTreeIter(NULL);
scene::Base::reverse_iterator deadSceneIter(NULL);
OptOutButtonEventHandlerBase deadOptOutEvent;
(void)deadTreeIter;
(void)deadSceneIter;
(void)deadOptOutEvent;
}
static u32 deadSBss;
DECOMP_FORCE_ACTIVE(iplChannelSelect_cpp, deadSBss);
#endif // NON_MATCHING
} // namespace scene
} // namespace ipl

View File

@@ -2900,60 +2900,6 @@ namespace ipl {
}
void ChannelTitle::startResetting() {
// clang-format off
static const f32 pad0 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad1 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad2 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad3 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad4 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad5 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad6 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad7 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad8 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad9 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad10 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad11 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad12 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad13 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad14 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad15 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad16 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad17 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad18 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad19 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad20 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad21 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad22 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad23 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad24 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad25 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad26 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad27 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad28 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad29 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad30 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad31 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad32 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad33 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad34 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad35 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad36 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad37 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad38 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad39 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad40 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad41 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad42 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad43 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad44 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const f32 pad45 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
static const u8 pad53 __attribute__((section(".sdata"), aligned(1), used)) = 0;
static const u8 pad54 __attribute__((section(".sdata"), aligned(1), used)) = 0;
static const u8 pad55 __attribute__((section(".sdata"), aligned(1), used)) = 0;
static const u8 pad56 __attribute__((section(".sdata"), aligned(1), used)) = 0;
static const u8 pad57 __attribute__((section(".sdata"), aligned(1), used)) = 0;
static const u8 pad58 __attribute__((section(".sdata"), aligned(1), used)) = 0;
// clang-format on
snd::getSystem()->resetAllSound();
}
} // namespace scene

File diff suppressed because it is too large Load Diff

View File

@@ -795,6 +795,172 @@ namespace ipl {
blr
}
asm BOOL Manager::doUpdateChanInfos(register ESTitleId* titleIds) {
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_20
mr r27, r3
mr r28, r4
li r3, 0
li r30, 0
li r26, 0
li r25, 0
li r20, 3
li r21, 0
li r22, 0xe
li r23, -1
doUpdateChanInfos_L1:
add r31, r27, r26
li r29, 0
li r24, 0
doUpdateChanInfos_L2:
add r4, r31, r24
lbz r0, 0x30(r4)
cmplwi r0, 1
beq doUpdateChanInfos_L5
add r0, r29, r25
lwz r9, 0x38(r4)
slwi r0, r0, 3
lwz r5, 0x3c(r4)
add r8, r28, r0
lwzx r6, r28, r0
lwz r7, 4(r8)
xor r0, r9, r6
xor r5, r5, r7
or. r0, r5, r0
beq doUpdateChanInfos_L5
or. r0, r7, r6
bne doUpdateChanInfos_L4
addi r3, r4, 0x30
li r4, 0
li r5, 0x10
bl memset
b doUpdateChanInfos_L6
doUpdateChanInfos_L4:
stb r20, 0x30(r4)
stb r21, 0x31(r4)
stb r21, 0x32(r4)
stb r21, 0x33(r4)
stw r22, 0x34(r4)
lwz r0, 0(r8)
and r0, r0, r23
stw r0, 0x38(r4)
lwz r0, 4(r8)
and r0, r0, r23
stw r0, 0x3c(r4)
doUpdateChanInfos_L6:
li r3, 1
doUpdateChanInfos_L5:
addi r29, r29, 1
addi r24, r24, 0x10
cmpwi r29, 0xc
blt doUpdateChanInfos_L2
addi r30, r30, 1
addi r25, r25, 0xc
cmpwi r30, 4
addi r26, r26, 0xc0
blt doUpdateChanInfos_L1
addi r11, r1, 0x40
bl _restgpr_20
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
}
asm void Manager::iplSavedata_813596B8(register ESTitleId titleId) {
nofralloc
lis r7, 0x4841
lis r4, 1
addi r0, r7, 0x5445
addi r8, r4, 1
xor r4, r6, r0
xor r0, r5, r8
or. r0, r4, r0
beqlr
addi r4, r7, 0x4445
xor r0, r5, r8
xor r4, r6, r4
or. r0, r4, r0
bne iplSavedata_813596B8_L1
blr
iplSavedata_813596B8_L1:
addis r0, r5, -1
cmplwi r0, 1
beq iplSavedata_813596B8_L2
cmplwi r0, 3
beq iplSavedata_813596B8_L2
cmplwi r0, 4
beq iplSavedata_813596B8_L2
cmplwi r0, 6
bnelr
iplSavedata_813596B8_L2:
li r0, 0x30
li r9, 0
li r4, 0
mtctr r0
iplSavedata_813596B8_L3:
add r7, r3, r4
lwz r0, 0x340(r7)
lwz r7, 0x344(r7)
xor r0, r5, r0
xor r7, r6, r7
or. r0, r7, r0
beq iplSavedata_813596B8_L4
addi r9, r9, 1
addi r4, r4, 8
bdnz iplSavedata_813596B8_L3
iplSavedata_813596B8_L4:
cmpwi r9, 0x30
bne iplSavedata_813596B8_L5
li r9, 0x2f
iplSavedata_813596B8_L5:
slwi r4, r9, 3
mtctr r9
cmpwi r9, 0
ble iplSavedata_813596B8_L6
iplSavedata_813596B8_L7:
addi r0, r9, -1
add r7, r3, r4
slwi r0, r0, 3
addi r9, r9, -1
add r8, r3, r0
addi r4, r4, -8
lwz r0, 0x340(r8)
lwz r8, 0x344(r8)
stw r8, 0x344(r7)
stw r0, 0x340(r7)
bdnz iplSavedata_813596B8_L7
iplSavedata_813596B8_L6:
stw r6, 0x344(r3)
stw r5, 0x340(r3)
blr
}
extern "C" asm BOOL iplSavedata_813597A0(register void* manager, register ESTitleId titleId) {
nofralloc
li r0, 0x30
li r4, 0
mtctr r0
iplSavedata_813597A0_L1:
add r7, r3, r4
lwz r0, 0x340(r7)
lwz r7, 0x344(r7)
xor r0, r5, r0
xor r7, r6, r7
or. r0, r7, r0
bne iplSavedata_813597A0_L2
li r3, 1
blr
iplSavedata_813597A0_L2:
addi r4, r4, 8
bdnz iplSavedata_813597A0_L1
li r3, 0
blr
}
asm void Manager::makeTmpList(register ESTitleId* titleIdsOut, register u32 availableCount, register ESTitleId* titleIdsIn, register u32 titleCount) {
nofralloc
@@ -950,82 +1116,6 @@ namespace ipl {
addi r1, r1, 0x20
blr
}
asm BOOL Manager::doUpdateChanInfos(register ESTitleId* titleIds) {
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_20
mr r27, r3
mr r28, r4
li r3, 0
li r30, 0
li r26, 0
li r25, 0
li r20, 3
li r21, 0
li r22, 0xe
li r23, -1
doUpdateChanInfos_L1:
add r31, r27, r26
li r29, 0
li r24, 0
doUpdateChanInfos_L2:
add r4, r31, r24
lbz r0, 0x30(r4)
cmplwi r0, 1
beq doUpdateChanInfos_L5
add r0, r29, r25
lwz r9, 0x38(r4)
slwi r0, r0, 3
lwz r5, 0x3c(r4)
add r8, r28, r0
lwzx r6, r28, r0
lwz r7, 4(r8)
xor r0, r9, r6
xor r5, r5, r7
or. r0, r5, r0
beq doUpdateChanInfos_L5
or. r0, r7, r6
bne doUpdateChanInfos_L4
addi r3, r4, 0x30
li r4, 0
li r5, 0x10
bl memset
b doUpdateChanInfos_L6
doUpdateChanInfos_L4:
stb r20, 0x30(r4)
stb r21, 0x31(r4)
stb r21, 0x32(r4)
stb r21, 0x33(r4)
stw r22, 0x34(r4)
lwz r0, 0(r8)
and r0, r0, r23
stw r0, 0x38(r4)
lwz r0, 4(r8)
and r0, r0, r23
stw r0, 0x3c(r4)
doUpdateChanInfos_L6:
li r3, 1
doUpdateChanInfos_L5:
addi r29, r29, 1
addi r24, r24, 0x10
cmpwi r29, 0xc
blt doUpdateChanInfos_L2
addi r30, r30, 1
addi r25, r25, 0xc
cmpwi r30, 4
addi r26, r26, 0xc0
blt doUpdateChanInfos_L1
addi r11, r1, 0x40
bl _restgpr_20
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
}
#endif
BOOL Manager::checkValidApp(ESTitleId titleId) {
@@ -1199,97 +1289,6 @@ namespace ipl {
mData.prevSDPage = 0;
}
asm void Manager::iplSavedata_813596B8(register ESTitleId titleId) {
nofralloc
lis r7, 0x4841
lis r4, 1
addi r0, r7, 0x5445
addi r8, r4, 1
xor r4, r6, r0
xor r0, r5, r8
or. r0, r4, r0
beqlr
addi r4, r7, 0x4445
xor r0, r5, r8
xor r4, r6, r4
or. r0, r4, r0
bne iplSavedata_813596B8_L1
blr
iplSavedata_813596B8_L1:
addis r0, r5, -1
cmplwi r0, 1
beq iplSavedata_813596B8_L2
cmplwi r0, 3
beq iplSavedata_813596B8_L2
cmplwi r0, 4
beq iplSavedata_813596B8_L2
cmplwi r0, 6
bnelr
iplSavedata_813596B8_L2:
li r0, 0x30
li r9, 0
li r4, 0
mtctr r0
iplSavedata_813596B8_L3:
add r7, r3, r4
lwz r0, 0x340(r7)
lwz r7, 0x344(r7)
xor r0, r5, r0
xor r7, r6, r7
or. r0, r7, r0
beq iplSavedata_813596B8_L4
addi r9, r9, 1
addi r4, r4, 8
bdnz iplSavedata_813596B8_L3
iplSavedata_813596B8_L4:
cmpwi r9, 0x30
bne iplSavedata_813596B8_L5
li r9, 0x2f
iplSavedata_813596B8_L5:
slwi r4, r9, 3
mtctr r9
cmpwi r9, 0
ble iplSavedata_813596B8_L6
iplSavedata_813596B8_L7:
addi r0, r9, -1
add r7, r3, r4
slwi r0, r0, 3
addi r9, r9, -1
add r8, r3, r0
addi r4, r4, -8
lwz r0, 0x340(r8)
lwz r8, 0x344(r8)
stw r8, 0x344(r7)
stw r0, 0x340(r7)
bdnz iplSavedata_813596B8_L7
iplSavedata_813596B8_L6:
stw r6, 0x344(r3)
stw r5, 0x340(r3)
blr
}
extern "C" asm BOOL iplSavedata_813597A0(register void* manager, register ESTitleId titleId) {
nofralloc
li r0, 0x30
li r4, 0
mtctr r0
iplSavedata_813597A0_L1:
add r7, r3, r4
lwz r0, 0x340(r7)
lwz r7, 0x344(r7)
xor r0, r5, r0
xor r7, r6, r7
or. r0, r7, r0
bne iplSavedata_813597A0_L2
li r3, 1
blr
iplSavedata_813597A0_L2:
addi r4, r4, 8
bdnz iplSavedata_813597A0_L1
li r3, 0
blr
}
BOOL Manager::nand_error_handling(int code) {
BOOL result = FALSE;