From 00ff866e67e119a19b5e7f69ff0bed9e2fbc5baa Mon Sep 17 00:00:00 2001 From: MikeIsAStar <99037623+MikeIsAStar@users.noreply.github.com> Date: Sat, 24 Aug 2024 11:45:00 -0400 Subject: [PATCH] [MKW] Do not automatically display the exception console This was valuable for debugging exceptions during the development of the payload, but it is no longer required now that we have attained a level of maturity. --- payload/import/egg/exception.hpp | 27 --------------------------- payload/wwfcPayload.cpp | 7 ++----- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 payload/import/egg/exception.hpp diff --git a/payload/import/egg/exception.hpp b/payload/import/egg/exception.hpp deleted file mode 100644 index 7eeca10..0000000 --- a/payload/import/egg/exception.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include - -namespace EGG -{ - -class Exception -{ -public: - Exception(); - virtual ~Exception(); - - static void SetUserCallBack(void* arg) - { -#if RMC - LONGCALL void SetUserCallBack(void* arg) - AT(RMCXD_PORT(0x802267F0, 0x8022646C, 0x80226710, 0x80226B64)); - - SetUserCallBack(arg); -#endif - } -}; - -static_assert(sizeof(Exception) == 0x04); - -} // namespace EGG diff --git a/payload/wwfcPayload.cpp b/payload/wwfcPayload.cpp index 23d68b7..8d796d4 100644 --- a/payload/wwfcPayload.cpp +++ b/payload/wwfcPayload.cpp @@ -1,4 +1,3 @@ -#include "import/egg/exception.hpp" #include "wwfcLogin.hpp" #include "wwfcPatch.hpp" #include "wwfcSupport.hpp" @@ -115,8 +114,8 @@ static void CallCtors(const wwfc_payload* const payload) continue; } - ctor = (decltype(ctor) - ) (reinterpret_cast(payload) + ctorOffset); + ctor = (decltype(ctor)) (reinterpret_cast(payload) + + ctorOffset); (*ctor)(); } } @@ -143,8 +142,6 @@ s32 EntryAfterGOT(wwfc_payload* payload) # endif #endif - EGG::Exception::SetUserCallBack(nullptr); - CallCtors(payload); Patch::ApplyPatchList(