diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2024-05-31 20:10:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 20:10:22 -0400 |
| commit | fda931e2aead6b77c099f0e09d34ebd17c2d238c (patch) | |
| tree | 513414b3df3ead1c84b02e72808253d2069728ac /src/egg/core/eggController.cpp | |
| parent | bc9eaa1ca985315386ceed621c9fb64fc88d4eac (diff) | |
| parent | 35a4b294a158286fb1b44241914b780abecde9d2 (diff) | |
Merge pull request #47 from robojumper/m_pad
m_pad
Diffstat (limited to 'src/egg/core/eggController.cpp')
| -rw-r--r-- | src/egg/core/eggController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/egg/core/eggController.cpp b/src/egg/core/eggController.cpp index d6a4c4eb..3088eff2 100644 --- a/src/egg/core/eggController.cpp +++ b/src/egg/core/eggController.cpp @@ -173,7 +173,7 @@ extern "C" void fn_803DB1E0(s32 channel, bool arg); CoreControllerMgr::T__Disposer::sStaticDisposer = nullptr; } -/* 0x80499BE0 */ EGG::CoreController *CoreControllerMgr::getNthController(s32 n) { +/* 0x80499BE0 */ EGG::CoreController *CoreControllerMgr::getNthController(int n) { return this->mControllers(n); } @@ -186,7 +186,7 @@ extern "C" void fn_803DB1E0(s32 channel, bool arg); return 1; } -/* 0x80499CD0 */ void CoreControllerMgr::connectCallback(int a1, int a2) { +/* 0x80499CD0 */ void CoreControllerMgr::connectCallback(s32 a1, s32 a2) { int args[] = {a1, a2}; if (sConnectCallback != nullptr) { (sConnectCallback)(args); |
