mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove old stuff + add test messages

This commit is contained in:
Sarge-117 2022-08-09 18:35:39 -07:00
parent b4c9f4aa6e
commit 3c4405347d
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
soh/CMakeLists.txt
View File

@ -485,7 +485,6 @@ set(Source_Files__src__code
"src/code/z_map_exp.c"
"src/code/z_map_mark.c"
"src/code/z_message_PAL.c"
"src/code/z_message_RandoNaviTips.c"
"src/code/z_moji.c"
"src/code/z_msgevent.c"
"src/code/z_olib.c"

25
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -4419,13 +4419,16 @@ void CreateScrubMessages() {
}
}
CustomMessageMinimal NaviMessages[];
void CreateNaviRandoMessages() {
CustomMessageManager* customMessageManager = CustomMessageManager::Instance;
customMessageManager->AddCustomMessageTable(Randomizer::NaviRandoMessageTableID);
customMessageManager->CreateMessage(Randomizer::NaviRandoMessageTableID, 0x00,
{ TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM, "Test Eng0", "Test Ger", "Test Fre" });
customMessageManager->CreateMessage(Randomizer::NaviRandoMessageTableID, 0x01,
{ TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM, "Test Eng1", "Test Ger", "Test Fre" });
for (int i = 0; i <= 3; i++) {
customMessageManager->CreateMessage(Randomizer::NaviRandoMessageTableID, i,
{ TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM, NaviMessages[i].english,
NaviMessages[i].german, NaviMessages[i].french });
}
}
void Randomizer::CreateCustomMessages() {
@ -4471,3 +4474,17 @@ void Rando_Init(void) {
}
}
CustomMessageMinimal NaviMessages[3] = { { "%cMissing a small key in a dungeon?&Maybe the %rboss %chas it!",
"%cGerman tip about playing rando! 0",
"%cFrench tip about playing rando! 0" },
{ "%cSometimes you can use the %rMegaton &Hammer %cinstead of bombs!",
"%cGerman tip about playing rando! 1",
"%cFrench tip about playing rando! 1" },
{ "%cThere are three %gbusiness scrubs %cin &Hyrule who sell %wmysterious items%c. Do &you know where they are?",
"%cGerman tip about playing rando! 2",
"%cFrench tip about playing rando! 2" }
};

2
soh/soh/OTRGlobals.cpp
View File

@ -1450,7 +1450,7 @@ extern "C" CustomMessageEntry Randomizer_GetScrubMessage(u16 scrubTextId) {
}
extern "C" CustomMessageEntry Randomizer_GetNaviMessage() {
u16 naviTextId = rand() % 2;
u16 naviTextId = rand() % 3;
return CustomMessageManager::Instance->RetrieveMessage(Randomizer::NaviRandoMessageTableID, naviTextId);
}

7
soh/src/code/z_message_PAL.c
View File

@ -1682,13 +1682,6 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) {
memcpy(font->msgBuf, src, font->msgLength);
}
/*
// (From z_player.c) In rando, Navi gives rando-related advice
if (textId == 0x0140 && gSaveContext.n64ddFlag) {
RandoNaviTip(globalCtx);
msgCtx->msgLength = font->msgLength = strlen(font->msgBuf);
}*/
msgCtx->textBoxProperties = font->charTexBuf[0];
msgCtx->textBoxType = msgCtx->textBoxProperties >> 4;
msgCtx->textBoxPos = msgCtx->textBoxProperties & 0xF;

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

@ -15292,9 +15292,5 @@ 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 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);
// }
}
}