diff options
| author | inspectredc <78732756+inspectredc@users.noreply.github.com> | 2025-04-02 12:40:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-02 07:40:43 -0400 |
| commit | a5a80bd8a25794ec5f69e4b512e181e457c9ba47 (patch) | |
| tree | bc0c0609fe0f1f91d7f9d31e9ebc8519446f2388 | |
| parent | 9892bfaffac39c7ceddf0ca7586927a7d0023456 (diff) | |
Fix Crash On Play Scene Inits (#5276)
| -rw-r--r-- | soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp | 1 | ||||
| -rw-r--r-- | soh/src/code/z_scene.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp index eb935146a..5eeabb99c 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp @@ -15,6 +15,7 @@ #include "soh/Enhancements/debugger/performanceTimer.h" #include <string> +#include <sstream> #include <vector> #include <set> #include <libultraship/libultraship.h> diff --git a/soh/src/code/z_scene.c b/soh/src/code/z_scene.c index 632f46e2d..c138bd4cf 100644 --- a/soh/src/code/z_scene.c +++ b/soh/src/code/z_scene.c @@ -507,11 +507,13 @@ void (*gSceneCmdHandlers[SCENE_CMD_ID_MAX])(PlayState*, SceneCmd*) = { Scene_CommandMiscSettings, // SCENE_CMD_ID_MISC_SETTINGS }; +// clang-format off RomFile sNaviMsgFiles[] = { - ROM_FILE(text / elf_message_field / elf_message_field), - ROM_FILE(text / elf_message_ydan / elf_message_ydan), + ROM_FILE(text/elf_message_field/elf_message_field), + ROM_FILE(text/elf_message_ydan/elf_message_ydan), ROM_FILE_UNSET, }; +// clang-format on s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD }; |