nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove unnecessary includes of OTRGlobals.h in actor overlays (#6306)

Browse Source
This commit is contained in:
Philip Dubé
2026-02-28 00:44:41 +00:00
committed by GitHub
parent 6b51909aa5
commit 5a7bc9a459
42 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
soh/src/code/z_room.c
View File

@@ -4,7 +4,6 @@
#include "global.h"
#include "vt.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include <string.h>
#include <assert.h>

1
soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
View File

@@ -11,7 +11,6 @@
#include "scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"
#include "scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h"
#include "soh/frame_interpolation.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
View File

@@ -7,7 +7,6 @@
#include "z_bg_gjyo_bridge.h"
#include "objects/object_gjyo_objects/object_gjyo_objects.h"
#include "scenes/dungeons/ganon_tou/ganon_tou_scene.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS 0

1
soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
View File

@@ -6,7 +6,6 @@
#include "z_bg_spot12_saku.h"
#include "objects/object_spot12_obj/object_spot12_obj.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS 0

1
soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
View File

@@ -7,7 +7,6 @@
#include "z_bg_treemouth.h"
#include "objects/object_spot04_objects/object_spot04_objects.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

1
soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
View File

@@ -5,7 +5,6 @@
#include "objects/object_toki_objects/object_toki_objects.h"
#include "soh/frame_interpolation.h"
#include <assert.h>
#include "soh/OTRGlobals.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

1
soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
View File

@@ -1,7 +1,6 @@
#include "z_door_warp1.h"
#include "objects/object_warp1/object_warp1.h"
#include "soh/Enhancements/randomizer/randomizer_entrance.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS 0

1
soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
View File

@@ -6,7 +6,6 @@
#include "z_en_ani.h"
#include "objects/object_ani/object_ani.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
View File

@@ -2,7 +2,6 @@
#include "vt.h"
#include "overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h"
#include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

1
soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
View File

@@ -8,7 +8,6 @@
#include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h"
#include "objects/object_zo/object_zo.h"
#include "vt.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Du/z_en_du.c
View File

@@ -1,7 +1,6 @@
#include "z_en_du.h"
#include "objects/object_du/object_du.h"
#include "scenes/overworld/spot18/spot18_scene.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_DURING_OCARINA)

1
soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
View File

@@ -8,7 +8,6 @@
#include "overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "vt.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

1
soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
View File

@@ -4,7 +4,6 @@
#include "objects/object_fr/object_fr.h"
#include <assert.h>
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#define FLAGS \

1
soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c
View File

@@ -7,7 +7,6 @@
#include "z_en_fu.h"
#include "objects/object_fu/object_fu.h"
#include "scenes/indoors/hakasitarelay/hakasitarelay_scene.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#define FLAGS \

1
soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
View File

@@ -7,7 +7,6 @@
#include "z_en_gb.h"
#include "objects/object_ps/object_ps.h"
#include "soh/frame_interpolation.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
View File

@@ -8,7 +8,6 @@
#include "vt.h"
#include "objects/object_ge1/object_ge1.h"
#include "soh/Enhancements/randomizer/randomizer_entrance.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View File

@@ -10,7 +10,6 @@
#include "soh/Enhancements/randomizer/randomizer_entrance.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include <assert.h>
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

1
soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
View File

@@ -6,7 +6,6 @@
#include "z_en_ge3.h"
#include "objects/object_geldb/object_geldb.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
View File

@@ -10,7 +10,6 @@
#include "vt.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include <assert.h>
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

1
soh/src/overlays/actors/ovl_En_Go/z_en_go.c
View File

@@ -3,7 +3,6 @@
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_oF1d_map/object_oF1d_map.h"
#include "soh/frame_interpolation.h"
#include "soh/OTRGlobals.h"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \

1
soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
View File

@@ -3,7 +3,6 @@
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_oF1d_map/object_oF1d_map.h"
#include "soh/frame_interpolation.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
View File

@@ -7,7 +7,6 @@
#include "z_en_hs.h"
#include "vt.h"
#include "objects/object_hs/object_hs.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
View File

@@ -14,7 +14,6 @@
#include "objects/object_cne/object_cne.h"
#include "objects/object_cob/object_cob.h"
#include "objects/object_os_anime/object_os_anime.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
View File

@@ -7,7 +7,6 @@
#include "z_en_kakasi2.h"
#include "vt.h"
#include "objects/object_ka/object_ka.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
View File

@@ -10,7 +10,6 @@
#include "objects/object_km1/object_km1.h"
#include "objects/object_kw1/object_kw1.h"
#include "vt.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
View File

@@ -6,7 +6,6 @@
#include "z_en_kz.h"
#include "objects/object_kz/object_kz.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View File

@@ -6,7 +6,6 @@
#include "z_en_ma1.h"
#include "objects/object_ma1/object_ma1.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS \

1
soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
View File

@@ -6,7 +6,6 @@
#include "z_en_mk.h"
#include "objects/object_mk/object_mk.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
View File

@@ -6,7 +6,6 @@
#include "z_en_ms.h"
#include "objects/object_ms/object_ms.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
View File

@@ -3,7 +3,6 @@
#include "objects/object_os_anime/object_os_anime.h"
#include "overlays/actors/ovl_En_Niw/z_en_niw.h"
#include "vt.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
View File

@@ -8,7 +8,6 @@
#include "scenes/misc/hakaana_ouke/hakaana_ouke_scene.h"
#include "scenes/overworld/spot02/spot02_scene.h"
#include "vt.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)

1
soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
View File

@@ -9,7 +9,6 @@
#include "objects/object_po_sisters/object_po_sisters.h"
#include "soh/frame_interpolation.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#define FLAGS \

1
soh/src/overlays/actors/ovl_En_Si/z_en_si.c
View File

@@ -7,7 +7,6 @@
#include "z_en_si.h"
#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/OTRGlobals.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR)

1
soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
View File

@@ -3,7 +3,6 @@
#include "objects/object_skj/object_skj.h"
#include "soh/Enhancements/enhancementTypes.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#define FLAGS \

1
soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
View File

@@ -10,7 +10,6 @@
#include "objects/object_boj/object_boj.h"
#include <assert.h>
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

1
soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
View File

@@ -4,7 +4,6 @@
#include "objects/object_ossan/object_ossan.h"
#include "soh/Enhancements/randomizer/randomizer_entrance.h"
#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
View File

@@ -6,7 +6,6 @@
#include "z_en_toryo.h"
#include "objects/object_toryo/object_toryo.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
View File

@@ -13,7 +13,6 @@
#include "scenes/indoors/tokinoma/tokinoma_scene.h"
#include "scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
#include "vt.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
View File

@@ -7,7 +7,6 @@
#include "z_en_zl4.h"
#include "objects/object_zl4/object_zl4.h"
#include "scenes/indoors/nakaniwa/nakaniwa_scene.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

1
soh/src/overlays/actors/ovl_Fishing/z_fishing.c
View File

@@ -11,7 +11,6 @@
#include "vt.h"
#include "soh/frame_interpolation.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

1
soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
View File

@@ -6,7 +6,6 @@
#include "z_item_b_heart.h"
#include "objects/object_gi_hearts/object_gi_hearts.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS 0

1
soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
View File

@@ -6,7 +6,6 @@
#include "z_item_etcetera.h"
#include <assert.h>
#include "soh/OTRGlobals.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED