mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-02 10:19:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Comment clarity

Browse Source
This commit is contained in:
Sarge-117
2022-08-07 16:31:50 -07:00
parent 6e8b45d129
commit 48a41bd11c
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_message_PAL.c
+2 -1
View File
@@ -1750,7 +1750,8 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) {
break;
}
msgCtx->msgLength = font->msgLength = strlen(font->msgBuf);
} else if (textId == 0x0140 && gSaveContext.n64ddFlag) { //888888888
// Give Navi rando-specific gameplay tips
} else if (textId == 0x0140 && gSaveContext.n64ddFlag) {
RandoNaviTip(globalCtx);
msgCtx->msgLength = font->msgLength = strlen(font->msgBuf);
} else {
soh/src/code/z_message_RandoNaviTips.c
+26 -2
View File
@@ -4,8 +4,14 @@
#include <string.h>
// Function for letting Navi give general rando tips to the player instead of her
// normal generic quest tips.
// Only applies to Navi's overworld quest hints - does not apply to enemy information
// or contextual hints (e.g. "This hallway is twisted!" in Forest Temple)
void RandoNaviTip(GlobalContext* globalCtx) {
u16 randNaviTip = rand() % 3;
u16 randNaviTip = rand() % 4;
MessageContext* msgCtx = &globalCtx->msgCtx;
Font* font = &msgCtx->font;
@@ -51,7 +57,25 @@ void RandoNaviTip(GlobalContext* globalCtx) {
default:
strcpy(font->msgBuf,
"\x08\x05\x44There are three\x05\x42 business scrubs\x05\x44 in\x01"
"Hyrule who sell \x05\x46mysterious items\x05\x44. Do\x01you know where they are?\x02");
"Hyrule who sell \x05\x49mysterious items\x05\x44. Do\x01you know where they are?\x02");
break;
}
}
if (randNaviTip == 3) {
switch (gSaveContext.language) {
case LANGUAGE_FRA:
strcpy(font->msgBuf, "\x08\x05\x44"
"French tip about playing rando!\x02");
break;
case LANGUAGE_GER:
strcpy(font->msgBuf, "\x08German tip about playing rando!\x02");
break;
case LANGUAGE_ENG:
default:
strcpy(font->msgBuf,
"\x08\x05\x44Stuck on this seed? You could\x01"
"throw in the towel and check the \x01"
"\x05\x49spoiler log\x05\x44...\x02");
break;
}
}
soh/src/overlays/actors/ovl_player_actor/z_player.c
+4 -4
View File
@@ -15286,9 +15286,9 @@ void func_80853148(GlobalContext* globalCtx, Actor* actor) {
if ((this->naviActor == this->targetActor) && ((this->targetActor->textId & 0xFF00) != 0x200)) {
this->naviActor->flags |= ACTOR_FLAG_8;
func_80835EA4(globalCtx, 0xB);
if (actor->textId >= 0x0140 && actor->textId <= 0x015F && gSaveContext.n64ddFlag) {
Message_StartTextbox(globalCtx, 0x0140, NULL);
}
// 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) {
// Message_StartTextbox(globalCtx, 0x0140, NULL);
// }
}
}