From 6be65a461d655f69baee8654bcc0c9945074bbd6 Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Mon, 13 Jul 2026 22:50:41 -0700 Subject: [PATCH] fix include paths to not pollute d_com_inf_game.h --- include/d/d_com_inf_game.h | 6 ++---- src/Z2AudioLib/Z2SceneMgr.cpp | 4 ++++ src/d/actor/d_a_b_bq.cpp | 1 + src/d/actor/d_a_b_ds.cpp | 4 ++++ src/d/actor/d_a_demo_item.cpp | 4 ++++ src/d/actor/d_a_door_shutter.cpp | 4 ++-- src/d/actor/d_a_e_md.cpp | 4 ++++ src/d/actor/d_a_e_mk.cpp | 1 + src/d/actor/d_a_e_rdb.cpp | 1 + src/d/actor/d_a_e_s1.cpp | 1 + src/d/actor/d_a_e_th_ball.cpp | 1 + src/d/actor/d_a_kytag08.cpp | 4 ++++ src/d/actor/d_a_npc.cpp | 1 + src/d/actor/d_a_npc_aru.cpp | 5 +++++ src/d/actor/d_a_npc_ashB.cpp | 1 + src/d/actor/d_a_npc_bans.cpp | 4 ++++ src/d/actor/d_a_npc_bouS.cpp | 4 ++++ src/d/actor/d_a_npc_chin.cpp | 4 ++++ src/d/actor/d_a_npc_fairy.cpp | 1 + src/d/actor/d_a_npc_gra.cpp | 1 + src/d/actor/d_a_npc_gro.cpp | 1 + src/d/actor/d_a_npc_grr.cpp | 1 + src/d/actor/d_a_npc_grs.cpp | 1 + src/d/actor/d_a_npc_impal.cpp | 1 + src/d/actor/d_a_npc_kkri.cpp | 1 + src/d/actor/d_a_npc_len.cpp | 1 + src/d/actor/d_a_npc_maro.cpp | 1 + src/d/actor/d_a_npc_myna2.cpp | 1 + src/d/actor/d_a_npc_prayer.cpp | 1 + src/d/actor/d_a_npc_rafrel.cpp | 1 + src/d/actor/d_a_npc_shad.cpp | 4 ++++ src/d/actor/d_a_npc_the.cpp | 1 + src/d/actor/d_a_npc_uri.cpp | 4 ++++ src/d/actor/d_a_npc_yelia.cpp | 1 + src/d/actor/d_a_npc_ykm.cpp | 3 +++ src/d/actor/d_a_npc_ykw.cpp | 1 + src/d/actor/d_a_npc_zra.inc | 4 ++++ src/d/actor/d_a_npc_zrc.cpp | 1 + src/d/actor/d_a_npc_zrz.cpp | 1 + src/d/actor/d_a_obj_Lv5Key.cpp | 1 + src/d/actor/d_a_obj_bosswarp.cpp | 4 ++++ src/d/actor/d_a_obj_gb.cpp | 1 + src/d/actor/d_a_obj_item.cpp | 1 + src/d/actor/d_a_obj_life_container.cpp | 1 + src/d/actor/d_a_obj_master_sword.cpp | 4 ++++ src/d/actor/d_a_obj_shield.cpp | 4 ++++ src/d/actor/d_a_obj_smallkey.cpp | 4 +++- src/d/actor/d_a_obj_swBallC.cpp | 1 + src/d/actor/d_a_obj_sword.cpp | 1 + src/d/actor/d_a_obj_wood_statue.cpp | 1 + src/d/actor/d_a_obj_zcloth.cpp | 1 + src/d/actor/d_a_obj_zra_rock.cpp | 1 + src/d/actor/d_a_shop_item.cpp | 1 + src/d/actor/d_a_tag_statue_evt.cpp | 4 ++++ src/d/actor/d_a_tbox.cpp | 1 + src/d/actor/d_a_tbox2.cpp | 1 + src/d/d_a_itembase_static.cpp | 4 ++++ src/d/d_event.cpp | 3 +++ src/d/d_event_manager.cpp | 3 ++- src/d/d_file_select.cpp | 1 + src/d/d_gameover.cpp | 3 +++ src/d/d_item.cpp | 1 + src/d/d_item_data.cpp | 3 ++- src/d/d_menu_ring.cpp | 1 + src/d/d_menu_save.cpp | 1 + src/d/d_meter2_info.cpp | 1 + src/d/d_msg_flow.cpp | 1 + src/d/d_msg_object.cpp | 1 + src/d/d_s_play.cpp | 1 + src/d/d_save.cpp | 1 + src/d/d_shop_system.cpp | 1 + src/dusk/autosave.cpp | 1 + src/dusk/imgui/ImGuiMenuRandomizer.hpp | 1 + src/dusk/randomizer/game/tools.cpp | 3 +++ src/dusk/randomizer/game/tools.h | 8 ++++++++ src/dusk/randomizer/generator/logic/entrance_shuffle.cpp | 1 + src/dusk/randomizer/generator/logic/hints.hpp | 7 +++++++ src/dusk/ui/editor.cpp | 1 + src/dusk/ui/rando_config.cpp | 4 ++++ src/f_op/f_op_actor_mng.cpp | 1 + 80 files changed, 162 insertions(+), 9 deletions(-) diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 4b8ced6a98..724141817e 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -1,10 +1,6 @@ #ifndef D_COM_D_COM_INF_GAME_H #define D_COM_D_COM_INF_GAME_H -#if TARGET_PC -#include "dusk/randomizer/game/randomizer_context.hpp" -#endif - #include "d/d_attention.h" #include "d/d_cc_s.h" #include "d/d_event.h" @@ -21,7 +17,9 @@ #include "m_Do/m_Do_graphic.h" #include +#if TARGET_PC #include "dusk/profiling.hpp" +#endif enum dComIfG_ButtonStatus { /* 0x00 */ BUTTON_STATUS_NONE, diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp index a20d258d43..94b3be2334 100644 --- a/src/Z2AudioLib/Z2SceneMgr.cpp +++ b/src/Z2AudioLib/Z2SceneMgr.cpp @@ -14,6 +14,10 @@ #include #include "Z2AudioLib/SpotName.h" +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance(true) { sceneNum = -1; BGM_ID = -1; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index b3e7068a3d..0564bb5a1c 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -19,6 +19,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #endif diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 28389417df..76dad2105c 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -19,6 +19,10 @@ #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + enum daB_DS_Joint { DS_JNT_BACKBONE1, DS_JNT_BACKBONE2, diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index f645e879b8..d0f079ef0c 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -15,6 +15,10 @@ #include "Z2AudioLib/Z2Instances.h" #include +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + static cXyz l_player_offset = cXyz(0.0f, 115.0f, 54.0f); static cXyz l_wolf_offset = cXyz(13.0f, 135.0f, 57.0f); diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index a52efd6cf6..3139fd44ac 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -23,6 +23,7 @@ #if TARGET_PC #include #include +#include "dusk/randomizer/game/randomizer_context.hpp" #endif char DUSK_CONST* daDoor20_c::getStopBmdName() { @@ -320,8 +321,7 @@ int daDoor20_c::checkOpenMsgDoor(int* param_1) { int rv = 1; // If we are in SPR, we don't want Yeta's msg flow to prevent us from opening the door if we haven't talked to her. - if (randomizer_IsActive() && !daAlink_c::checkStageName("D_MN11")) - { + if (randomizer_IsActive() && !daAlink_c::checkStageName("D_MN11")) { rv = field_0x624.checkOpenDoor(this, param_1); } #else diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index d8c3f7f54d..146b23f4d3 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -10,6 +10,10 @@ #include "d/d_s_play.h" #include "c/c_damagereaction.h" +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + enum daE_MD_TYPE { TYPE_DUMMY, TYPE_REAL, diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 902be8ec72..b854c87591 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -22,6 +22,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #endif diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 8164128d91..3cfd71080a 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -17,6 +17,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index fbc0375429..dd40d92cbc 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #if TARGET_PC #include "d/actor/d_a_alink.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #endif #include "d/d_com_inf_game.h" #include "d/d_path.h" diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index 54ce006720..71ec95f8b0 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_s_play.h" #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif enum daE_TH_ACTION { diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index 6120fd142c..8c62b2e28d 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -10,6 +10,10 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_spinner.h" +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + static int daKytag08_Draw(kytag08_class* i_this) { return 1; } diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 1577c01d73..9cc1781205 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -15,6 +15,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/stages.h" #include "dusk/randomizer/game/tools.h" #endif diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 0aafd85f37..cd07d21f50 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -14,6 +14,11 @@ #include "d/d_meter2_info.h" #include "d/actor/d_a_horse.h" #include "Z2AudioLib/Z2Instances.h" + +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + #if DEBUG #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 2605794fd1..a3bb0c41f5 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -11,6 +11,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 49a7a69352..ce2acb1a27 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -13,6 +13,10 @@ #include "d/actor/d_a_npc_len.h" #include +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + enum Bans_RES_File_ID { /* BCK */ /* 0x06 */ BCK_BANS_F_TALK_A = 0x6, diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 90d10e0657..7dba72b8ce 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -14,6 +14,10 @@ #include "d/d_camera.h" #include +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + enum Bou_RES_File_ID { /* BCK */ /* 0x06 */ BCK_BOU_F_TALK_A = 0x6, diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 854fa7845f..fc98916fec 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -11,6 +11,10 @@ #include "d/d_meter2_info.h" #include "d/d_timer.h" +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + enum Event { EVT_NONE, EVT_GAME_START, diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index dccf45f8b8..49f7903dbc 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -12,6 +12,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 018c5f9018..75c3122a08 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -15,6 +15,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index d72b874de7..ac87c537e5 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -14,6 +14,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 467bb65ec2..f2e840ecd1 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -11,6 +11,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 8e4dba7c00..e15abdb940 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -12,6 +12,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif enum Event_Cut_Nums { diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index d5a5ca166b..bd961dc5d4 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -10,6 +10,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index c18ef3137c..1dca80d64f 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -10,6 +10,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 6b84245d39..71aab698e9 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -10,6 +10,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 5e8a695801..c770ee56bd 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -18,6 +18,7 @@ #include "d/d_item.h" #include "d/d_timer.h" #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif #if DEBUG diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index ea1af4338b..654f887552 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -12,6 +12,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index 6957394e2e..e5f25c9d23 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_prayer.h" #include "d/d_com_inf_game.h" #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index fe8ac244cf..591b906849 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -11,6 +11,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #include "dusk/randomizer/game/flags.h" #endif diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 933e6d7782..98091f427a 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -12,6 +12,10 @@ #include "d/d_msg_object.h" #include +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + const daNpcShad_HIOParam daNpcShad_Param_c::m = { 35.0f, // attention_offset -3.0f, // gravity diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index b8574bc6fc..eac57426fa 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -13,6 +13,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index e369681e2a..d3a8455009 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -10,6 +10,10 @@ #include "m_Do/m_Do_graphic.h" #include +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + const daNpc_Uri_HIOParam daNpc_Uri_Param_c::m = { 200.0f, // attention_offset -3.0f, // gravity diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 4d892cb746..7e8fd1d7f3 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -11,6 +11,7 @@ #if TARGET_PC #include "dusk/string.hpp" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #endif diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 02bf7b572f..3160ab2525 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -20,6 +20,9 @@ #include "d/d_tresure.h" #include +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif enum ykM_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index d7f0102fa8..2074595072 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -22,6 +22,7 @@ #if TARGET_PC #include "dusk/string.hpp" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc index 0dea40529e..ca6a981bbb 100644 --- a/src/d/actor/d_a_npc_zra.inc +++ b/src/d/actor/d_a_npc_zra.inc @@ -1,3 +1,7 @@ +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + BOOL daNpc_zrA_c::wait(void* param_0) { switch (mMode) { case 0: diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index a006762df8..4816411e6d 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -11,6 +11,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "Z2AudioLib/Z2Instances.h" #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index 23070b5514..cbdb55a493 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -16,6 +16,7 @@ #if TARGET_PC #include "dusk/randomizer/game/flags.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index 3841ee4f5f..1780ceaee8 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #if TARGET_PC #include "d/d_map.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #endif static int useHeapInit(fopAc_ac_c*); diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index 4d5a71066f..b206bdbfb1 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -14,6 +14,10 @@ #include "d/actor/d_a_obj_ystone.h" #include +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + static DUSK_CONST char* l_arcName = "ef_Portal"; static char const* l_clearEvName[9] = { diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 795631c066..87c569edbf 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -13,6 +13,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/stages.h" #include "dusk/randomizer/game/tools.h" #endif diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index ae8d2263ea..5d33f80f34 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -19,6 +19,7 @@ #if TARGET_PC #include "d/actor/d_a_alink.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/game/verify_item_functions.h" #include "dusk/frame_interpolation.h" diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index a4430d5792..425faa361c 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -15,6 +15,7 @@ #if TARGET_PC #include "d/actor/d_a_alink.h" #include "dusk/randomizer/game/flags.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/game/verify_item_functions.h" #include "dusk/randomizer/game/stages.h" diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index f46819cd2e..8601d67313 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -10,6 +10,10 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + daObjMasterSword_Attr_c const daObjMasterSword_c::mAttr = {1.0f}; void daObjMasterSword_c::initBaseMtx() { diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 1d3958116d..7cfe76b3d9 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -13,6 +13,10 @@ #include "d/d_item_data.h" #include +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + const static dCcD_SrcCyl l_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}}, // mObj diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index 2184089140..1bcb6ef101 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -13,8 +13,10 @@ #include "f_op/f_op_camera_mng.h" #include -#include "d/actor/d_a_tboxSw.h" +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" +#endif const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index 48ef8510c9..c0d2d7c445 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -16,6 +16,7 @@ #include "f_op/f_op_msg.h" #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #endif diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index 84a130aea0..9a09981055 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 55d6ace40f..6326b6dfbd 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -13,6 +13,7 @@ #include "d/d_s_play.h" #if TARGET_PC #include "dusk/randomizer/game/flags.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index 7fadc7f72d..f67fd362cf 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -12,6 +12,7 @@ #include "f_pc/f_pc_name.h" #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp index 2dc4b7db66..221b44a32b 100644 --- a/src/d/actor/d_a_obj_zra_rock.cpp +++ b/src/d/actor/d_a_obj_zra_rock.cpp @@ -11,6 +11,7 @@ #include "f_pc/f_pc_name.h" #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/flags.h" #endif diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 69b4216fc4..3ea476b9e6 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -13,6 +13,7 @@ #if TARGET_PC #include "d/d_item_data.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index 256018decc..d661413d85 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -9,8 +9,12 @@ #include "d/actor/d_a_tag_statue_evt.h" #include "d/d_com_inf_game.h" #include "d/d_debug_viewer.h" + +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/game/verify_item_functions.h" +#endif class daTagStatue_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 1a529f7e18..caf28da23a 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -13,6 +13,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index bd8e4554d7..ce14a3019c 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -12,6 +12,7 @@ #if TARGET_PC #include "dusk/randomizer/game/tools.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/d_a_itembase_static.cpp b/src/d/d_a_itembase_static.cpp index 7d91a42fe9..b68511a32a 100644 --- a/src/d/d_a_itembase_static.cpp +++ b/src/d/d_a_itembase_static.cpp @@ -10,6 +10,10 @@ #include "d/actor/d_a_itembase.h" #include "d/d_item_data.h" +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif + u8 daItemBase_c::getItemNo() { return M_ITEMNO_MODEL_ITEM_ID; } diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 9ac55625c1..fbe3aa882c 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -13,7 +13,10 @@ #include "SSystem/SComponent/c_counter.h" #include +#if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/string.hpp" +#endif namespace { static u8 event_debug_evnt() { diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 08e64ce5c8..4e377e79d5 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -16,9 +16,10 @@ #include #if TARGET_PC #include "dusk/randomizer/game/verify_item_functions.h" +#include "dusk/randomizer/game/randomizer_context.hpp" +#include "dusk/string.hpp" #endif -#include "dusk/string.hpp" #if DEBUG static dEvM_HIO_c l_HIO; diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 2c96e92b76..dbacbdcc77 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -26,6 +26,7 @@ #if TARGET_PC #include "dusk/config.hpp" #include "dusk/menu_pointer.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/string.hpp" #include "dusk/ui/modal.hpp" #include "dusk/ui/rando_config.hpp" diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index b08ff9b59a..f4ae6c7457 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -14,7 +14,10 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include +#if TARGET_PC #include "dusk/gx_helper.h" +#include "dusk/randomizer/game/randomizer_context.hpp" +#endif class dGov_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index ab0ea890e9..13755e0acb 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -12,6 +12,7 @@ #include "dusk/randomizer/game/flags.h" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/game/stages.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif #include diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 0f3831375c..a8683d0294 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -1,8 +1,9 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_item_data.h" + #if TARGET_PC -#include "d/d_com_inf_game.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #endif dItem_itemResource dItem_data::item_resource[] = { diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index d223268cb6..bbff0fb113 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -33,6 +33,7 @@ #include "dusk/menu_pointer.h" #include "dusk/settings.h" #include "dusk/ui/touch_controls.hpp" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #include "dusk/randomizer/game/tools.h" #endif diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index f0518b6413..2ce116df5b 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -25,6 +25,7 @@ #include "dusk/config.hpp" #include "dusk/frame_interpolation.h" #include "dusk/menu_pointer.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/settings.h" #endif diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index 6a8d656666..e791fe6265 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -16,6 +16,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/string.hpp" #include "battery/embed.hpp" #endif diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index 0522755c02..6bb123be18 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -19,6 +19,7 @@ #include "dusk/randomizer/game/flags.h" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/game/stages.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #endif diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 8227ddd140..28292b3f86 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -32,6 +32,7 @@ #if TARGET_PC #include "d/d_item.h" #include "dusk/randomizer/game/messages.hpp" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/stages.h" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/game/verify_item_functions.h" diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index c1210a1013..67fea1698c 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -42,6 +42,7 @@ #if TARGET_PC #include "dusk/autosave.h" #include "dusk/memory.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #include #include "dusk/ui/ui.hpp" diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index ec6b8925ee..91265823d1 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -21,6 +21,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/flags.h" #include "dusk/randomizer/game/stages.h" #include "dusk/randomizer/game/tools.h" diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index 196385870a..6031d04790 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -20,6 +20,7 @@ #include #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/game/stages.h" diff --git a/src/dusk/autosave.cpp b/src/dusk/autosave.cpp index faf3077577..3a99799033 100644 --- a/src/dusk/autosave.cpp +++ b/src/dusk/autosave.cpp @@ -3,6 +3,7 @@ #include "dusk/config.hpp" #include "dusk/ui/ui.hpp" #include "imgui/ImGuiConsole.hpp" +#include "dusk/randomizer/game/randomizer_context.hpp" bool shouldAutoSave = false; u8 mSaveBuffer[QUEST_LOG_SIZE * 3]; diff --git a/src/dusk/imgui/ImGuiMenuRandomizer.hpp b/src/dusk/imgui/ImGuiMenuRandomizer.hpp index 02a276c56a..652b59c2ca 100644 --- a/src/dusk/imgui/ImGuiMenuRandomizer.hpp +++ b/src/dusk/imgui/ImGuiMenuRandomizer.hpp @@ -1,5 +1,6 @@ #ifndef DUSK_IMGUI_MENU_RANDOMIZER_HPP #define DUSK_IMGUI_MENU_RANDOMIZER_HPP +#include "dusk/randomizer/generator/logic/requirement.hpp" #include "dusk/randomizer/generator/logic/search.hpp" namespace randomizer { diff --git a/src/dusk/randomizer/game/tools.cpp b/src/dusk/randomizer/game/tools.cpp index 71791ba9d2..9a6b2991a3 100644 --- a/src/dusk/randomizer/game/tools.cpp +++ b/src/dusk/randomizer/game/tools.cpp @@ -1,10 +1,13 @@ #include "tools.h" + #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_item_data.h" #include "dusk/logging.h" +#include "dusk/randomizer/generator/logic/world.hpp" #include "f_op/f_op_actor_mng.h" +#include "randomizer_context.hpp" #include "stages.h" #include "verify_item_functions.h" diff --git a/src/dusk/randomizer/game/tools.h b/src/dusk/randomizer/game/tools.h index 74995bd5a8..ce10c6b2de 100644 --- a/src/dusk/randomizer/game/tools.h +++ b/src/dusk/randomizer/game/tools.h @@ -1,6 +1,14 @@ #pragma once #include "dolphin/types.h" +#include "dusk/randomizer/generator/logic/item_pool.hpp" + +namespace randomizer::logic::location { +class Location; +} +namespace randomizer::logic::world { +class World; +} bool playerIsInRoomStage(s32 room, const char* stage); void checkTransformFromWolf(); diff --git a/src/dusk/randomizer/generator/logic/entrance_shuffle.cpp b/src/dusk/randomizer/generator/logic/entrance_shuffle.cpp index a6e10a398b..340bb7d43e 100644 --- a/src/dusk/randomizer/generator/logic/entrance_shuffle.cpp +++ b/src/dusk/randomizer/generator/logic/entrance_shuffle.cpp @@ -2,6 +2,7 @@ #include "item_pool.hpp" #include "search.hpp" +#include "../randomizer.hpp" #include "../utility/random.hpp" #include "../utility/yaml.hpp" diff --git a/src/dusk/randomizer/generator/logic/hints.hpp b/src/dusk/randomizer/generator/logic/hints.hpp index 28e5484773..62628d9f72 100644 --- a/src/dusk/randomizer/generator/logic/hints.hpp +++ b/src/dusk/randomizer/generator/logic/hints.hpp @@ -1,5 +1,12 @@ #pragma once +#include + +namespace randomizer::logic::world { +class World; +using WorldPool = std::vector>; +} + namespace randomizer::logic::hints { void GenerateAllHints(world::WorldPool& worldPool); diff --git a/src/dusk/ui/editor.cpp b/src/dusk/ui/editor.cpp index 43e348b4a9..1928be0eac 100644 --- a/src/dusk/ui/editor.cpp +++ b/src/dusk/ui/editor.cpp @@ -9,6 +9,7 @@ #include "d/d_kankyo.h" #include "d/d_meter2_info.h" #include "dusk/map_loader_definitions.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #include "number_button.hpp" #include "pane.hpp" diff --git a/src/dusk/ui/rando_config.cpp b/src/dusk/ui/rando_config.cpp index 262cc57f50..e9be80c216 100644 --- a/src/dusk/ui/rando_config.cpp +++ b/src/dusk/ui/rando_config.cpp @@ -4,9 +4,12 @@ #include "dusk/config.hpp" #include "dusk/data.hpp" #include "dusk/logging.h" +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/tools.h" #include "dusk/randomizer/generator/seedgen/seed.hpp" #include "dusk/randomizer/generator/utility/string.hpp" +#include "dusk/randomizer/generator/utility/text.hpp" +#include "dusk/randomizer/generator/utility/yaml.hpp" #include "modal.hpp" #include "number_button.hpp" #include "pane.hpp" @@ -17,6 +20,7 @@ #include #include +#include namespace dusk::ui { diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 41592d5f07..5dcd1f7f8b 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -31,6 +31,7 @@ #include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_lib.h" #if TARGET_PC +#include "dusk/randomizer/game/randomizer_context.hpp" #include "dusk/randomizer/game/verify_item_functions.h" #include "dusk/randomizer/game/tools.h" #endif