mirror of
https://github.com/CraftyBoss/SuperMarioOdysseyOnline.git
synced 2024-11-25 12:45:17 +00:00
Merge pull request #67 from Istador/pr-main-mod-menu
Replace the action guide with the SMOO Mod Menu
This commit is contained in:
commit
6493ef8d35
16 changed files with 7 additions and 9 deletions
|
@ -99,13 +99,14 @@ B59E28 B seadPrintHook // sead::system::print
|
||||||
|
|
||||||
// Pause Menu Changes
|
// Pause Menu Changes
|
||||||
|
|
||||||
4EAEC4 B overrideNerveHook // makes any button on pause menu run a specific nerve
|
// 4EAEC4 B overrideNerveHook // makes any button on pause menu run a specific nerve
|
||||||
4EA104 MOV W2, #5 // update state count to account for new custom state
|
4EA104 MOV W2, #5 // update state count to account for new custom state
|
||||||
4EA1F0 BL initNerveStateHook // inits options nerve state and server config state
|
4EA1F0 BL initNerveStateHook // inits options nerve state and server config state
|
||||||
4EA174 MOV X0, X20 // moves StageSceneStatePauseMenu to first arg
|
4EA174 MOV X0, X20 // moves StageSceneStatePauseMenu to first arg
|
||||||
4EA17C NOP // prevents first new of StageSceneStateOption
|
4EA17C NOP // prevents first new of StageSceneStateOption
|
||||||
4EA1A8 BL initStateHook // inits StageSceneStateOption and StageSceneStateServerConfig
|
4EA1A8 BL initStateHook // inits StageSceneStateOption and StageSceneStateServerConfig
|
||||||
4EA1C0 NOP // prevents mStateOption ptr from being overriden
|
4EA1C0 NOP // prevents mStateOption ptr from being overriden
|
||||||
|
4EAFA4 B overrideHelpFadeNerve
|
||||||
|
|
||||||
// Gravity hooks
|
// Gravity hooks
|
||||||
|
|
||||||
|
|
BIN
romfs/LocalizedData/CNzh/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/CNzh/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/EUde/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/EUde/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/EUen/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/EUen/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/EUes/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/EUes/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/EUfr/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/EUfr/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/EUit/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/EUit/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/EUnl/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/EUnl/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/EUru/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/EUru/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/JPja/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/JPja/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/TWzh/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/TWzh/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/USen/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/USen/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/USes/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/USes/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
BIN
romfs/LocalizedData/USfr/MessageData/LayoutMessage.szs
Normal file
BIN
romfs/LocalizedData/USfr/MessageData/LayoutMessage.szs
Normal file
Binary file not shown.
|
@ -86,13 +86,10 @@ bool registerShineToList(Shine* shineActor) {
|
||||||
return al::isAlive(shineActor);
|
return al::isAlive(shineActor);
|
||||||
}
|
}
|
||||||
|
|
||||||
void overrideNerveHook(StageSceneStatePauseMenu* thisPtr, al::Nerve* nrvSet) {
|
void overrideHelpFadeNerve(StageSceneStatePauseMenu* thisPtr) {
|
||||||
|
// Set label in menu inside LocalizedData/${lang}/MessageData/LayoutMessage.szs/Menu.msbt/Menu_Help
|
||||||
if (al::isPadHoldZL(-1)) {
|
thisPtr->exeServerConfig();
|
||||||
al::setNerve(thisPtr, &nrvStageSceneStatePauseMenuServerConfig);
|
al::setNerve(thisPtr, &nrvStageSceneStatePauseMenuServerConfig);
|
||||||
} else {
|
|
||||||
al::setNerve(thisPtr, nrvSet);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
StageSceneStateServerConfig *sceneStateServerConfig = nullptr;
|
StageSceneStateServerConfig *sceneStateServerConfig = nullptr;
|
||||||
|
|
|
@ -36,7 +36,7 @@ StageSceneStateServerConfig::StageSceneStateServerConfig(
|
||||||
mMainOptions = new SimpleLayoutMenu("ServerConfigMenu", "OptionSelect", initInfo, 0, false);
|
mMainOptions = new SimpleLayoutMenu("ServerConfigMenu", "OptionSelect", initInfo, 0, false);
|
||||||
mMainOptionsList = new CommonVerticalList(mMainOptions, initInfo, true);
|
mMainOptionsList = new CommonVerticalList(mMainOptions, initInfo, true);
|
||||||
|
|
||||||
al::setPaneString(mMainOptions, "TxtOption", u"Server Configuration", 0);
|
al::setPaneString(mMainOptions, "TxtOption", u"SMOO Mod Menu", 0);
|
||||||
|
|
||||||
mMainOptionsList->unkInt1 = 1;
|
mMainOptionsList->unkInt1 = 1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue