mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-23 22:32:50 -05:00
Code Issues Projects Releases Wiki Activity

Set Navi timer back to normal

Browse Source
This commit is contained in:
Sarge-117 2022-08-07 16:33:44 -07:00
parent 48a41bd11c
commit a5acf6da20
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
View File

@ -1382,7 +1382,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) {
if (player->naviTextId == 0) { if (player->naviTextId == 0) {
if (player->unk_664 == NULL) { if (player->unk_664 == NULL) {
if (((gSaveContext.naviTimer >= 40) && (gSaveContext.naviTimer <= 3000)) || (nREG(89) != 0)) { if (((gSaveContext.naviTimer >= 600) && (gSaveContext.naviTimer <= 3000)) || (nREG(89) != 0)) {
player->naviTextId = ElfMessage_GetCUpText(globalCtx); player->naviTextId = ElfMessage_GetCUpText(globalCtx);
if (player->naviTextId == 0x15F) { if (player->naviTextId == 0x15F) {
@ -1401,7 +1401,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) {
if (thisx->textId == ElfMessage_GetCUpText(globalCtx)) { if (thisx->textId == ElfMessage_GetCUpText(globalCtx)) {
this->fairyFlags |= 0x80; this->fairyFlags |= 0x80;
gSaveContext.naviTimer = 10; gSaveContext.naviTimer = 3001;
} }
this->fairyFlags |= 0x10; this->fairyFlags |= 0x10;

6
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -15287,8 +15287,8 @@ void func_80853148(GlobalContext* globalCtx, Actor* actor) {
this->naviActor->flags |= ACTOR_FLAG_8; this->naviActor->flags |= ACTOR_FLAG_8;
func_80835EA4(globalCtx, 0xB); func_80835EA4(globalCtx, 0xB);
// If rando'd and Navi wants to give you a general quest tip, give a rando tip instead // If rando'd and Navi wants to give you a general quest tip, give a rando tip instead
// if (actor->textId >= 0x0140 && actor->textId <= 0x015F && gSaveContext.n64ddFlag) { if (actor->textId >= 0x0140 && actor->textId <= 0x015F && gSaveContext.n64ddFlag) {
// Message_StartTextbox(globalCtx, 0x0140, NULL); Message_StartTextbox(globalCtx, 0x0140, NULL);
// } }
} }
} }