Skip to content

Commit

Permalink
Include more hints.
Browse files Browse the repository at this point in the history
Include a hack fix for including the B button in junk hints.
  • Loading branch information
PhlexPlexico committed Jan 16, 2024
1 parent 0f3bd98 commit 82b08d6
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 18 deletions.
34 changes: 17 additions & 17 deletions source/hint_list.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -869,23 +869,23 @@ void HintTable_Init() {
hintTable[JUNK58] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK59] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK60] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK61] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK62] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK63] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK64] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK65] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK66] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK67] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK68] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK69] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK70] = HintText::Junk({Text{"", "", ""}});
hintTable[JUMK71] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK72] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK73] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK74] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK75] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK76] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK77] = HintText::Junk({Text{"", "", ""}});
hintTable[JUNK61] = HintText::Junk({Text{"Glitches are a pathway to many abilities some consider to be... Unnatural.", "", ""}});
hintTable[JUNK62] = HintText::Junk({Text{"You ever just feel like smashing that $ button?", "", ""}});
hintTable[JUNK63] = HintText::Junk({Text{"I think the Mask of Truth has it's uses!", "", ""}});
hintTable[JUNK64] = HintText::Junk({Text{"There's a lot of eyes here, isn't there?", "", ""}});
hintTable[JUNK65] = HintText::Junk({Text{"I think that #large object in the sky# hasn't moved in a few days.", "", ""}});
hintTable[JUNK66] = HintText::Junk({Text{"Watch out for that #large object in the sky!#", "", ""}});
hintTable[JUNK67] = HintText::Junk({Text{"#Tingle Tingle Kooloo Limpah!#", "", ""}});
hintTable[JUNK68] = HintText::Junk({Text{"They say if you have three specific items, you can zoom across Termina.", "", ""}});
hintTable[JUNK69] = HintText::Junk({Text{"They say the powder keg can remain fairly elusive.", "", ""}});
hintTable[JUNK70] = HintText::Junk({Text{"It's pretty cold here, would you mind warming me up, @?", "", ""}});
hintTable[JUMK71] = HintText::Junk({Text{"These hints can be quite useful. This is an exception.", "", ""}});
hintTable[JUNK72] = HintText::Junk({Text{"Turns are more effective when you tilt the whole console.", "", ""}});
hintTable[JUNK73] = HintText::Junk({Text{"You ever been in a cockpit before?", "", ""}});
hintTable[JUNK74] = HintText::Junk({Text{"Smash 10 pots in 12 seconds.", "", ""}});
hintTable[JUNK75] = HintText::Junk({Text{"You found me!", "", ""}});
hintTable[JUNK76] = HintText::Junk({Text{"I have it on my post-it note somewhere.", "", ""}});
hintTable[JUNK77] = HintText::Junk({Text{"Follow the rainbow.", "", ""}});

/*------------------------
| DUNGEON HINT TEXT |
Expand Down
10 changes: 9 additions & 1 deletion source/hints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,13 @@ static void AddHint(Text hint, const LocationKey gossipStone, const std::vector<

//create the in game message
u16 messageId = Location(gossipStone)->GetTextID();
std::vector<iconType> icons = {};
//u32 sariaMessageId = 0xA00 + Location(gossipStone)->GetFlag();
CitraPrint("Our hint text is " + hint.GetEnglish());
CustomMessages::CreateMessage(messageId, 0xFFFF, 0x3FFFFFFF, 0xFF0020, hint.GetEnglish().c_str(), colors, {}, {}, 0x0, false, false);
if (hint.GetEnglish().find("$")) {
icons.push_back(B_BUTTON);
}
CustomMessages::CreateMessage(messageId, 0xFFFF, 0x3FFFFFFF, 0xFF0020, hint.GetEnglish().c_str(), colors, icons, {}, 0x0, false, false);
//CreateMessageFromTextObject(messageId, 0, 2, 3, AddColorsAndFormat(hint, colors));
//CreateMessageFromTextObject(sariaMessageId, 0, 2, 3, AddColorsAndFormat(hint + EVENT_TRIGGER(), colors));
}
Expand Down Expand Up @@ -394,6 +398,10 @@ static void CreateJunkHint() {

PlacementLog_Msg("\tMessage: ");
PlacementLog_Msg(hint.english);
PlacementLog_Msg("\n");

PlacementLog_Msg("\tLocation: ");
PlacementLog_Msg(Location(gossipStone)->GetName());
PlacementLog_Msg("\n\n");

AddHint(hint, gossipStone, {QM_RED});
Expand Down

0 comments on commit 82b08d6

Please sign in to comment.