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

Force the Sarias Song magic hint to replace all other Sarias Song text. (#3296)

This commit is contained in:
Pepper0ni 2023-11-04 21:56:03 +00:00 committed by GitHub
parent e88c8e68b6
commit 02afac704e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/custom-message/CustomMessageTypes.h
View File

@ -3,8 +3,8 @@
typedef enum {
TEXT_CURSED_SKULLTULA_PEOPLE = 0x22,
TEXT_SARIAS_SONG_FACE_TO_FACE= 0x160,
TEXT_SARIAS_SONG_FOREST_SOUNDS = 0x161,
TEXT_SARIAS_SONG_FOREST_TEMPLE = 0x16A,
TEXT_SARIAS_SONG_TEXT_START = 0x160,
TEXT_SARIAS_SONG_TEXT_END = 0x16D,
TEXT_SARIA_SFM = 0x10AD,
TEXT_ITEM_KEY_SMALL = 0x60,
TEXT_ITEM_DUNGEON_MAP = 0x66,

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

@ -486,8 +486,8 @@ void Randomizer::LoadHintLocations(const char* spoilerFileName) {
"Des grenouilles se trouvant&sous l'eau vous fixent attentivement,&tenant fermement&%g{{item}}%w.", TEXTBOX_TYPE_BLUE)
);
CustomMessageManager::Instance->CreateMessage(
Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FOREST_SOUNDS,
CustomMessage("{{message}}", "{{message}}", "{{message}}", TEXTBOX_TYPE_BLUE)
Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FACE_TO_FACE,
CustomMessage("{{message}}", "{{message}}", "{{message}}", TEXTBOX_TYPE_BLUE) //is this even used?
);
@ -5342,7 +5342,7 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
}
CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) {
if (originalTextId == TEXT_SARIA_SFM || originalTextId == TEXT_SARIAS_SONG_FOREST_SOUNDS || TEXT_SARIAS_SONG_FOREST_TEMPLE) {
if (originalTextId == TEXT_SARIA_SFM || (originalTextId >= TEXT_SARIAS_SONG_TEXT_START && originalTextId <= TEXT_SARIAS_SONG_TEXT_END)) {
CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE);
CustomMessage messageEntry2 = messageEntry;
std::string code = originalTextId == TEXT_SARIA_SFM ? "" : "\x0B";

3
soh/soh/OTRGlobals.cpp
View File

@ -2190,8 +2190,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
} else if (Randomizer_GetSettingValue(RSK_FROGS_HINT) && textId == TEXT_FROGS_UNDERWATER) {
messageEntry = OTRGlobals::Instance->gRandomizer->GetFrogsMessage(textId);
} else if (Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
if ((gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || textId == TEXT_SARIAS_SONG_FOREST_SOUNDS ||
textId == TEXT_SARIAS_SONG_FOREST_TEMPLE) {
if ((gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_TEXT_START && textId <= TEXT_SARIAS_SONG_TEXT_END)) {
messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId);
}
}