Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/RSPE01_01/splits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3217,7 +3217,7 @@ Pack/RPKernel/RPSysAppMiiManager.cpp:
.text start:0x801A6360 end:0x801A6424
.data start:0x803B9E90 end:0x803B9EA0

Pack/RPKernel/RPSysControllerSyncMgr.cpp:
Pack/RPKernel/RPSysPairingMgr.cpp:
.text start:0x801A6424 end:0x801A6554
.sbss start:0x804BF5B0 end:0x804BF5B8

Expand Down
176 changes: 84 additions & 92 deletions config/RSPE01_01/symbols.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ def MatchingFor(*versions):
Object(NonMatching, "Pack/RPKernel/RPSysTutorialWinMgr.cpp"),
Object(Matching, "Pack/RPKernel/RPSysLytPicture.cpp"),
Object(NonMatching, "Pack/RPKernel/RPSysTagProcessor.cpp"),
Object(NonMatching, "Pack/RPKernel/RPSysController.cpp"),
Object(Matching, "Pack/RPKernel/RPSysController.cpp"),
Object(NonMatching, "Pack/RPKernel/RPSysKokeshiIcon.cpp"),
Object(Matching, "Pack/RPKernel/RPSysKokeshiGenInfo.cpp"),
Object(Matching, "Pack/RPKernel/RPSysKokeshiLocation.cpp"),
Expand All @@ -1193,7 +1193,7 @@ def MatchingFor(*versions):
Object(Matching, "Pack/RPKernel/RPSysKokeshiCtrlDataMgr.cpp"),
Object(Matching, "Pack/RPKernel/RPSysKokeshiCtrlMgr.cpp"),
Object(NonMatching, "Pack/RPKernel/RPSysAppMiiManager.cpp"),
Object(Matching, "Pack/RPKernel/RPSysControllerSyncMgr.cpp"),
Object(Matching, "Pack/RPKernel/RPSysPairingMgr.cpp"),
Object(NonMatching, "Pack/RPKernel/RPSysControllerMgr.cpp"),
Object(NonMatching, "Pack/RPKernel/RPSysNWC24Manager.cpp"),
Object(NonMatching, "Pack/RPKernel/RPSysParticleManager.cpp"),
Expand Down
7 changes: 7 additions & 0 deletions include/Pack/RPAudio/RPSndAudioMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,13 @@ class RPSndAudioMgr : public EGG::ExpAudioMgr {
return mPlayerNum;
}

/**
* @brief Accesses the static sound archive manager
*/
RPSndStaticMgr& getStaticMgr() {
return mStaticMgr;
}

private:
/**
* @brief Audio manager flags
Expand Down
4 changes: 1 addition & 3 deletions include/Pack/RPAudio/RPSndObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
#include <nw4r/snd.h>
#include <nw4r/ut.h>

#include <revolution/WPAD.h>

//! @addtogroup rp_audio
//! @{

Expand Down Expand Up @@ -201,7 +199,7 @@ class TRPSndObject : public TRPSndAudio3DActor<N>,
};

//! Shorthand for default specialization
typedef TRPSndObject<WPAD_MAX_CONTROLLERS> RPSndObject;
typedef TRPSndObject<RP_MAX_CONTROLLERS> RPSndObject;

/******************************************************************************
*
Expand Down
3 changes: 2 additions & 1 deletion include/Pack/RPKernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <Pack/RPKernel/RPSysAppMiiManager.h>
#include <Pack/RPKernel/RPSysAvatar.h>
#include <Pack/RPKernel/RPSysController.h>
#include <Pack/RPKernel/RPSysControllerSyncMgr.h>
#include <Pack/RPKernel/RPSysControllerMgr.h>
#include <Pack/RPKernel/RPSysFile.h>
#include <Pack/RPKernel/RPSysFrameCtrl.h>
#include <Pack/RPKernel/RPSysHomeMenuMgr.h>
Expand Down Expand Up @@ -36,6 +36,7 @@
#include <Pack/RPKernel/RPSysMiddleDBGenInfo.h>
#include <Pack/RPKernel/RPSysNWC24Manager.h>
#include <Pack/RPKernel/RPSysOfficialDB.h>
#include <Pack/RPKernel/RPSysPairingMgr.h>
#include <Pack/RPKernel/RPSysParticleManager.h>
#include <Pack/RPKernel/RPSysStringUtility.h>
#include <Pack/RPKernel/RPSysSystemWinMgr.h>
Expand Down
Loading
Loading