Merge remote-tracking branch 'origin/rando-mod' into rando-mod

This commit is contained in:
TakaRikka
2026-08-20 01:23:10 -07:00
2 changed files with 9 additions and 1 deletions
+8 -1
View File
@@ -181,7 +181,14 @@ DEFINE_HOOK(&daObjZraRock_c::create, daObjZraRock_c__create);
// DEFINE_HOOK_SYMBOL(phase_1_dScnPly_sig, int(dScnPly_c*), phase_1__dScnPly_c);
DEFINE_HOOK(&dMenu_Ring_c::textScaleHIO, dMenu_Ring_c__textScaleHIO);
DEFINE_HOOK_SYMBOL("dMenu_Ring_c::~dMenu_Ring_c", void(dMenu_Ring_c*), dMenu_Ring_c__destructor);
#ifdef _MSVC_LANG
#define dMenu_Ring_c__destructor_sig "??1dMenu_Ring_c@@UEAA@XZ"
#else
#define dMenu_Ring_c__destructor_sig "_ZN12dMenu_Ring_cD1Ev"
#endif
DEFINE_HOOK_SYMBOL(dMenu_Ring_c__destructor_sig, void(dMenu_Ring_c*), dMenu_Ring_c__destructor);
DEFINE_HOOK(&dMenu_Ring_c::setActiveCursor, dMenu_Ring_c__setActiveCursor);
DEFINE_HOOK(&dMenu_Ring_c::getItemMaxNum, dMenu_Ring_c__getItemMaxNum);
DEFINE_HOOK(&dMenu_Ring_c::getItemNum, dMenu_Ring_c__getItemNum);
+1
View File
@@ -1151,6 +1151,7 @@ ModResult buildPlayTab(ModContext* ctx, UiWindowHandle, UiElementHandle leftPane
// set flag to move to name screen after window close
g_file_select_window_ctx.is_proceed = true;
session::svc_mng.ui->window_close(session::svc_mng.mod_ctx, *static_cast<UiWindowHandle*>(userdata));
mDoAud_seStartMenu(Z2SE_SY_NEW_FILE);
};
desc.user_data = &g_file_select_window_ctx.window_handle;
desc.is_disabled = [](ModContext*, void*) {