diff options
| author | Christopher Leggett <chris@leggett.dev> | 2026-01-15 20:57:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-15 20:57:13 +0000 |
| commit | 7b3efb1e7b85783edd5d736eff07fbeae76a0d19 (patch) | |
| tree | cfba79c2ec1ae3906068109e912e08b09b0bf375 /soh/include | |
| parent | c43139ebd6359563266360c78702cdb0c72f0bdb (diff) | |
Upgrades Custom Messages to Hooks and ShipInit (#5101)
Defines the hook for OnTextLoad. Intercepts message loading with hooks. Adds file to handle the CustomMessage creation for items.
Handles Ice Traps, Triforce Pieces, and Custom Items. Handle maps, compasses, and keys
Converts gossip stone hints to hook. Handle one-off merchant messages. Convert scrubs and shop text and remove now-unused code
Convert Sheik and Ganondorf hint text. Convert skulltula people messages. Convert more static hints
Specifically Dampe, Greg, Warp Songs, Frogs, Loach, Fishing Pole, and Saria
Convert Biggoron Hint. Convert Big Poes hint. Convert Anju hint dialogue. Convert Malon hint. Convert Horseback Archery hints. Convert Mask Shop SIgn hint
Convert Lake Hylia Switch related text. Convert Shooting Gallery bow reminder message
Convert random rupee names. Convert Rando-Relevant Navi Enhancement. Convert Random Goron messages
Convert Injecting Skull token counts. Add in a way to AutoFormat with an item icon.. Fix some errors with skull tokens and apply icon
Convert heart container item counts. Convert Inject Item Count for Heart Pieces. Port Better Bombchu Shopping. Convert Market Sneak
Port Quit Fishing At Door and clean up unused stuff. Reintroduce missing Mysterious warp song hint
Make ShipInitFuncs static
Adds and uses per-item articles for get item messages
Fix Entrance Hints and port toggle from dev-copper
Diffstat (limited to 'soh/include')
| -rw-r--r-- | soh/include/macros.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/soh/include/macros.h b/soh/include/macros.h index acac5cd49..dd51786f1 100644 --- a/soh/include/macros.h +++ b/soh/include/macros.h @@ -330,10 +330,12 @@ extern GraphicsContext* __gfxCtx; #define GANONS_CASTLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_INSIDE_GANONS_CASTLE) ? 3 : 2) #define TREASURE_GAME_SMALL_KEY_MAX 6 -#define DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(randomizerSettingsKey) \ - (Randomizer_GetSettingValue(randomizerSettingsKey) != RO_DUNGEON_ITEM_LOC_STARTWITH && \ - Randomizer_GetSettingValue(randomizerSettingsKey) != RO_DUNGEON_ITEM_LOC_VANILLA && \ - Randomizer_GetSettingValue(randomizerSettingsKey) != RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) +#ifdef __cplusplus +#define DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(rsk) \ + (OTRGlobals::Instance->gRandoContext->GetOption(rsk).IsNot(RO_DUNGEON_ITEM_LOC_STARTWITH) && \ + OTRGlobals::Instance->gRandoContext->GetOption(rsk).IsNot(RO_DUNGEON_ITEM_LOC_VANILLA) && \ + OTRGlobals::Instance->gRandoContext->GetOption(rsk).IsNot(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON)) +#endif // #endregion #endif |