diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2024-10-06 00:38:46 -0500 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2024-10-06 00:38:46 -0500 |
| commit | 60fc8caa50af30ceba9a6572bfa6267fc89ffc4a (patch) | |
| tree | ad0e722df51eae060392481293def43175a6e695 /mm/2s2h/DeveloperTools/EventLog.cpp | |
| parent | ab30ca1617c12cf2e192d339af1269332976278c (diff) | |
| parent | 41d77dd9b4095e87fce1f3ffa2ab2e1b1b04b258 (diff) | |
Merge branch 'event-queue' of garrettjoecox.github.com:garrettjoecox/2ship2harkinian into develop-rando
Diffstat (limited to 'mm/2s2h/DeveloperTools/EventLog.cpp')
| -rw-r--r-- | mm/2s2h/DeveloperTools/EventLog.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mm/2s2h/DeveloperTools/EventLog.cpp b/mm/2s2h/DeveloperTools/EventLog.cpp index f799a0667..e73857e75 100644 --- a/mm/2s2h/DeveloperTools/EventLog.cpp +++ b/mm/2s2h/DeveloperTools/EventLog.cpp @@ -239,14 +239,15 @@ void RegisterEventLogHooks() { TrimEventLog(); }); - onOpenTextHookId = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnOpenText>([](u16* textId) { - eventLogEntries.insert(eventLogEntries.begin(), { - .timestamp = CurrentTime(), - .type = EVENT_LOG_ENTRY_TYPE_OPEN_TEXT, - .meta = fmt::format("0x{:02x}", *textId), - }); - TrimEventLog(); - }); + onOpenTextHookId = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnOpenText>( + [](u16* textId, bool* loadFromMessageTable) { + eventLogEntries.insert(eventLogEntries.begin(), { + .timestamp = CurrentTime(), + .type = EVENT_LOG_ENTRY_TYPE_OPEN_TEXT, + .meta = fmt::format("0x{:02x}", *textId), + }); + TrimEventLog(); + }); onItemGiveHookId = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemGive>([](u8 item) { eventLogEntries.insert(eventLogEntries.begin(), { |