nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Ganondorf hint formatting (#6331)

Browse Source
This commit is contained in:
Philip Dubé
2026-03-08 02:35:08 +00:00
committed by GitHub
parent a1aa046814
commit 3174545749
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp
View File

@@ -38,7 +38,6 @@ void BuildGanondorfHint(uint16_t* textId, bool* loadFromMessageTable) {
msg = RAND_GET_HINT(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0); msg = RAND_GET_HINT(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
} }
} }
msg.AutoFormat();
msg.LoadIntoFont(); msg.LoadIntoFont();
*loadFromMessageTable = false; *loadFromMessageTable = false;
} }

11
soh/soh/Enhancements/randomizer/hint.cpp
View File

@@ -130,14 +130,8 @@ void Hint::FillGapsInData() {
if (locations.size() == 0 && StaticData::staticHintInfoMap.contains(ownKey)) { if (locations.size() == 0 && StaticData::staticHintInfoMap.contains(ownKey)) {
locations = StaticData::staticHintInfoMap[ownKey].targetChecks; locations = StaticData::staticHintInfoMap[ownKey].targetChecks;
} }
bool fillAreas = true; bool fillAreas = areas.size() == 0;
bool fillItems = true; bool fillItems = items.size() == 0;
if (areas.size() > 0) {
fillAreas = false;
}
if (items.size() > 0) {
fillItems = false;
}
for (uint8_t c = 0; c < locations.size(); c++) { for (uint8_t c = 0; c < locations.size(); c++) {
// if area matters for the hint, it should be specified and not left to this // if area matters for the hint, it should be specified and not left to this
if (fillAreas) { if (fillAreas) {
@@ -205,6 +199,7 @@ void Hint::NamesChosen() {
hintType == HINT_TYPE_ALTAR_CHILD || hintType == HINT_TYPE_ALTAR_ADULT) { hintType == HINT_TYPE_ALTAR_CHILD || hintType == HINT_TYPE_ALTAR_ADULT) {
namesTemp = {}; namesTemp = {};
saveNames = false; saveNames = false;
for (uint8_t c = 0; c < areas.size(); c++) { for (uint8_t c = 0; c < areas.size(); c++) {
uint8_t selection = GetRandomHintTextEntry(GetAreaHintText(c)); uint8_t selection = GetRandomHintTextEntry(GetAreaHintText(c));
if (selection > 0) { if (selection > 0) {