Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 21:27:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Crash On Play Scene Inits (#5276)

Browse source
This commit is contained in:
inspectredc 2025-04-02 12:40:43 +01:00 • committed by GitHub
parent 9892bfaffa
commit a5a80bd8a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View file

@ -15,6 +15,7 @@
#include "soh/Enhancements/debugger/performanceTimer.h" #include "soh/Enhancements/debugger/performanceTimer.h"
#include <string> #include <string>
#include <sstream>
#include <vector> #include <vector>
#include <set> #include <set>
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>

6
soh/src/code/z_scene.c
View file

@ -507,11 +507,13 @@ void (*gSceneCmdHandlers[SCENE_CMD_ID_MAX])(PlayState*, SceneCmd*) = {
Scene_CommandMiscSettings, // SCENE_CMD_ID_MISC_SETTINGS Scene_CommandMiscSettings, // SCENE_CMD_ID_MISC_SETTINGS
}; };
// clang-format off
RomFile sNaviMsgFiles[] = { RomFile sNaviMsgFiles[] = {
ROM_FILE(text / elf_message_field / elf_message_field), ROM_FILE(text/elf_message_field/elf_message_field),
ROM_FILE(text / elf_message_ydan / elf_message_ydan), ROM_FILE(text/elf_message_ydan/elf_message_ydan),
ROM_FILE_UNSET, ROM_FILE_UNSET,
}; };
// clang-format on
s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD }; s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };