Mirrors
/
Zelda64Recomp
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add more flexible owl events

This commit is contained in:
LittleCube 2024-09-25 20:05:23 -04:00
parent a53b916ec7
commit 78c0e24b8b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
patches/autosaving.c
View File

@ -747,18 +747,23 @@ RECOMP_EXPORT void recomp_set_owls_quit_game(bool new_val)
owls_quit_game = new_val; owls_quit_game = new_val;
} }
RECOMP_DECLARE_EVENT(recomp_on_owl_update(ObjWarpstone* this, PlayState* play));
RECOMP_DECLARE_EVENT(recomp_on_owl_save(ObjWarpstone* this, PlayState* play)); RECOMP_DECLARE_EVENT(recomp_on_owl_save(ObjWarpstone* this, PlayState* play));
RECOMP_DECLARE_EVENT(recomp_after_owl_save(ObjWarpstone* this, PlayState* play));
// @recomp If autosave is enabled, skip the part of the owl statue dialog that talks about the file being deleted on load, since it's not true. // @recomp If autosave is enabled, skip the part of the owl statue dialog that talks about the file being deleted on load, since it's not true.
RECOMP_PATCH void ObjWarpstone_Update(Actor* thisx, PlayState* play) { RECOMP_PATCH void ObjWarpstone_Update(Actor* thisx, PlayState* play) {
ObjWarpstone* this = (ObjWarpstone*)thisx; ObjWarpstone* this = (ObjWarpstone*)thisx;
s32 pad; s32 pad;
recomp_on_owl_update(this, play);
if (this->isTalking) { if (this->isTalking) {
if (Actor_TextboxIsClosing(&this->dyna.actor, play)) { if (Actor_TextboxIsClosing(&this->dyna.actor, play)) {
this->isTalking = false; this->isTalking = false;
} else if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) { } else if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) {
if (play->msgCtx.choiceIndex != 0) { if (play->msgCtx.choiceIndex != 0) {
recomp_on_owl_save(this, play);
Audio_PlaySfx_MessageDecide(); Audio_PlaySfx_MessageDecide();
if (!owls_quit_game) { if (!owls_quit_game) {
Message_CloseTextbox(play); Message_CloseTextbox(play);
@ -768,7 +773,7 @@ RECOMP_PATCH void ObjWarpstone_Update(Actor* thisx, PlayState* play) {
play->msgCtx.unk120D6 = 0; play->msgCtx.unk120D6 = 0;
play->msgCtx.unk120D4 = 0; play->msgCtx.unk120D4 = 0;
gSaveContext.save.owlWarpId = OBJ_WARPSTONE_GET_OWL_WARP_ID(&this->dyna.actor); gSaveContext.save.owlWarpId = OBJ_WARPSTONE_GET_OWL_WARP_ID(&this->dyna.actor);
recomp_on_owl_save(this, play); recomp_after_owl_save(this, play);
} else { } else {
Message_CloseTextbox(play); Message_CloseTextbox(play);
} }