Make transformation mask hint use GetLocationNameForHint (HarbourMasters#1772)

garrettjoecox · web-flow · commit 6e0ff907108f · 2026-07-04T15:58:05.000-05:00
diff --git a/mm/2s2h/Rando/ActorBehavior/EnTalk.cpp b/mm/2s2h/Rando/ActorBehavior/EnTalk.cpp
@@ -1,7 +1,6 @@
 #include "ActorBehavior.h"
 #include "2s2h/CustomMessage/CustomMessage.h"
 #include "2s2h/GameInteractor/GameInteractor.h"
-#include "2s2h/ShipUtils.h"
 
 extern "C" {
 #include "variables.h"
@@ -118,7 +117,7 @@ void ApplyTransformationHints(u16* textId, bool* loadFromMessageTable) {
                     locationStr += " %w&%y\n";
                 }
 
-                locationStr += Ship_GetSceneName(Rando::StaticData::Checks[location].sceneId);
+                locationStr += Rando::StaticData::GetLocationNameForHint(location, false);
             }
             CustomMessage::Replace(&msg, "{{locations}}", locationStr);
         } else {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`#include "ActorBehavior.h"`
`2`	`2`	`#include "2s2h/CustomMessage/CustomMessage.h"`
`3`	`3`	`#include "2s2h/GameInteractor/GameInteractor.h"`
`4`		`-#include "2s2h/ShipUtils.h"`
`5`	`4`
`6`	`5`	`extern "C" {`
`7`	`6`	`#include "variables.h"`
`@@ -118,7 +117,7 @@ void ApplyTransformationHints(u16* textId, bool* loadFromMessageTable) {`
`118`	`117`	`locationStr += " %w&%y\n";`
`119`	`118`	`}`
`120`	`119`
`121`		`- locationStr += Ship_GetSceneName(Rando::StaticData::Checks[location].sceneId);`
	`120`	`+ locationStr += Rando::StaticData::GetLocationNameForHint(location, false);`
`122`	`121`	`}`
`123`	`122`	`CustomMessage::Replace(&msg, "{{locations}}", locationStr);`
`124`	`123`	`} else {`