From 4a35b9e798412df5a1479a74e30d78717c1bddd6 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Thu, 8 Dec 2022 10:44:30 -0500 Subject: [PATCH] fix: correctly parse custom nocturne warp text (#2116) This was causing an issue where hints were not being properly parsed, because ParseHintLocationsFile was erroring out when trying to read from a part of the json that didn't exist. Since that method is using pokemon exception handling, it was failing silently. This just makes it so the key in the spoiler log matches the key we're trying to read (and brings it in line with the rest of the warp text names) Co-authored-by: briaguya --- soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp index 8123843b2..4fe6ad3c9 100644 --- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp @@ -638,7 +638,7 @@ static void WriteHints(int language) { jsonData["warpBoleroText"] = GetWarpBoleroText().GetEnglish(); jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetEnglish(); jsonData["warpRequiemText"] = GetWarpRequiemText().GetEnglish(); - jsonData["warpNocturne"] = GetWarpNocturneText().GetEnglish(); + jsonData["warpNocturneText"] = GetWarpNocturneText().GetEnglish(); jsonData["warpPreludeText"] = GetWarpPreludeText().GetEnglish(); jsonData["childAltarText"] = GetChildAltarText().GetEnglish(); jsonData["adultAltarText"] = GetAdultAltarText().GetEnglish(); @@ -650,7 +650,7 @@ static void WriteHints(int language) { jsonData["warpBoleroText"] = GetWarpBoleroText().GetFrench(); jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetFrench(); jsonData["warpRequiemText"] = GetWarpRequiemText().GetFrench(); - jsonData["warpNocturne"] = GetWarpNocturneText().GetFrench(); + jsonData["warpNocturneText"] = GetWarpNocturneText().GetFrench(); jsonData["warpPreludeText"] = GetWarpPreludeText().GetFrench(); jsonData["childAltarText"] = GetChildAltarText().GetFrench(); jsonData["adultAltarText"] = GetAdultAltarText().GetFrench();