mirror of
https://github.com/Mr-Wiseguy/Zelda64Recomp.git
synced 2024-11-19 20:19:15 +01:00
use deletes instead of resets
This commit is contained in:
parent
bf4b4bd713
commit
0c712ba318
@ -740,11 +740,11 @@ RECOMP_PATCH void Sram_ResetSaveFromMoonCrash(SramContext* sramCtx) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool loading_resets_owl_save = true;
|
bool loading_deletes_owl_save = true;
|
||||||
|
|
||||||
RECOMP_EXPORT void recomp_set_loading_resets_owl_save(bool new_val)
|
RECOMP_EXPORT void recomp_set_loading_deletes_owl_save(bool new_val)
|
||||||
{
|
{
|
||||||
loading_resets_owl_save = new_val;
|
loading_deletes_owl_save = new_val;
|
||||||
}
|
}
|
||||||
|
|
||||||
RECOMP_DECLARE_EVENT(recomp_on_owl_update(ObjWarpstone* this, PlayState* play));
|
RECOMP_DECLARE_EVENT(recomp_on_owl_update(ObjWarpstone* this, PlayState* play));
|
||||||
@ -766,7 +766,7 @@ RECOMP_PATCH void ObjWarpstone_Update(Actor* thisx, PlayState* play) {
|
|||||||
recomp_on_owl_save(this, play);
|
recomp_on_owl_save(this, play);
|
||||||
Audio_PlaySfx_MessageDecide();
|
Audio_PlaySfx_MessageDecide();
|
||||||
// @recomp Only use normal owl save if flag is set.
|
// @recomp Only use normal owl save if flag is set.
|
||||||
if (loading_resets_owl_save) {
|
if (loading_deletes_owl_save) {
|
||||||
play->msgCtx.msgMode = MSGMODE_OWL_SAVE_0;
|
play->msgCtx.msgMode = MSGMODE_OWL_SAVE_0;
|
||||||
} else {
|
} else {
|
||||||
Message_CloseTextbox(play);
|
Message_CloseTextbox(play);
|
||||||
@ -786,7 +786,7 @@ RECOMP_PATCH void ObjWarpstone_Update(Actor* thisx, PlayState* play) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// @recomp Skip the text talking about the save being deleted on load, if autosave is enabled.
|
// @recomp Skip the text talking about the save being deleted on load, if autosave is enabled.
|
||||||
if (recomp_autosave_enabled() || !loading_resets_owl_save) {
|
if (recomp_autosave_enabled() || !loading_deletes_owl_save) {
|
||||||
if (this->isTalking && play->msgCtx.currentTextId == 0xC01 && play->msgCtx.msgBufPos == 269) {
|
if (this->isTalking && play->msgCtx.currentTextId == 0xC01 && play->msgCtx.msgBufPos == 269) {
|
||||||
play->msgCtx.msgBufPos = 530;
|
play->msgCtx.msgBufPos = 530;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user