From ce969cab902b62f8541d8caaebc0a48ab03c46bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= <159546+serprex@users.noreply.github.com> Date: Tue, 25 Aug 2026 08:02:02 +0000 Subject: [PATCH] clean up includes (#7114) --- .../Enhancements/ActorSkeletonUnregister.c | 2 -- soh/soh/Enhancements/BunnyHood.cpp | 1 - soh/soh/Enhancements/Cheats/DekuStick.cpp | 4 +-- .../Enhancements/Cheats/EasyFrameAdvance.cpp | 1 - soh/soh/Enhancements/Cheats/EasyISG.cpp | 2 +- soh/soh/Enhancements/Cheats/EasyQPA.cpp | 2 +- soh/soh/Enhancements/Cheats/FreezeTime.cpp | 5 +++- soh/soh/Enhancements/Cheats/GSTargetable.cpp | 9 ++++--- soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp | 6 ++--- .../Enhancements/Cheats/Infinite/Health.cpp | 5 +++- .../Enhancements/Cheats/Infinite/Magic.cpp | 2 +- .../Enhancements/Cheats/Infinite/Money.cpp | 8 +++--- .../Cheats/Infinite/NayrusLove.cpp | 5 +++- soh/soh/Enhancements/Cheats/MoonJump.cpp | 2 +- soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp | 3 +-- .../Enhancements/Cheats/NoKeeseGuayTarget.cpp | 2 +- .../Enhancements/Cheats/NoRedeadFreeze.cpp | 2 +- .../Enhancements/Cheats/UnrestrictedItems.cpp | 4 +-- .../Difficulty/AlwaysWinGoronPot.cpp | 2 +- .../Enhancements/Difficulty/BonkDamage.cpp | 2 +- .../Difficulty/CuccosToReturn.cpp | 4 +-- soh/soh/Enhancements/Difficulty/DampeFire.cpp | 4 +-- .../Enhancements/Difficulty/HyperBosses.cpp | 7 +++-- .../Enhancements/Difficulty/HyperEnemies.cpp | 5 +++- .../Difficulty/PermanentLosses.cpp | 3 +-- .../Difficulty/SwitchTimerMultiplier.cpp | 3 ++- .../Difficulty/TreesDropSticks.cpp | 3 ++- soh/soh/Enhancements/DropThrowOnlyActors.cpp | 1 - .../ExtraModes/BounceOffWalls.cpp | 2 +- .../Enhancements/ExtraModes/HurtContainer.cpp | 2 +- soh/soh/Enhancements/ExtraModes/IvanCoop.cpp | 4 +-- .../ExtraModes/RandomizedEnemySizes.cpp | 1 - soh/soh/Enhancements/ExtraModes/RupeeDash.cpp | 2 +- soh/soh/Enhancements/ExtraModes/ShadowTag.cpp | 5 +++- soh/soh/Enhancements/FileSelectEnhancements.h | 2 +- .../Enhancements/Fixes/BrokenGiantsKnife.cpp | 2 +- .../Fixes/DampeGoingBackwards.cpp | 2 +- .../Enhancements/Fixes/DekuNutUpgradeFix.cpp | 2 +- soh/soh/Enhancements/Fixes/DirtPathFix.cpp | 2 +- soh/soh/Enhancements/Fixes/FixFlexDrops.cpp | 2 +- .../Fixes/FixTwoHandedIdleAnim.cpp | 2 +- soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp | 3 +-- soh/soh/Enhancements/Fixes/FloorSwitches.cpp | 2 +- soh/soh/Enhancements/Fixes/HammerHandFix.cpp | 2 +- .../GameplayStats/BossDefeatTimestamps.cpp | 2 +- .../GameplayStats/EnemyDefeatCounts.cpp | 3 +-- .../Graphics/AgeDependentEquipment.cpp | 2 +- .../Graphics/Disable2DBackgrounds.cpp | 2 +- .../Graphics/DisableFixedCamera.cpp | 5 ++-- .../Graphics/DisableLinkSpinWithGoronPot.cpp | 2 +- .../Graphics/RemoveSpinAttackDarkness.cpp | 2 +- .../Enhancements/Graphics/ToTMedallions.cpp | 2 +- soh/soh/Enhancements/Items/ArrowCycle.cpp | 4 +-- .../Items/AssignableTunicsAndBoots.cpp | 3 +-- soh/soh/Enhancements/Items/BlueFireArrows.cpp | 3 +-- soh/soh/Enhancements/Items/ItemUnequip.cpp | 1 - soh/soh/Enhancements/Items/MaskSelect.cpp | 2 +- soh/soh/Enhancements/Items/RemoteBombchu.cpp | 4 +-- soh/soh/Enhancements/Items/SunlightArrows.cpp | 2 +- soh/soh/Enhancements/Lang/Lang.cpp | 15 +++++------ .../Enhancements/Minigames/BombchuBowling.cpp | 2 +- .../Minigames/DampeBothPrizes.cpp | 2 +- .../Minigames/DivingGameTimer.cpp | 2 +- .../Minigames/FrogsOcarinaGame.cpp | 4 +-- .../Minigames/HorsebackArchery.cpp | 3 +-- .../Enhancements/Minigames/IngoRaceOnce.cpp | 2 +- .../Minigames/LostWoodsOcarinaGame.cpp | 3 +-- .../Minigames/ShootingGallery.cpp | 1 - soh/soh/Enhancements/QoL/DaytimeGS.cpp | 2 +- .../Enhancements/QoL/EasyButterflyFairies.cpp | 1 - .../Enhancements/QoL/NoSkulltulaFreeze.cpp | 3 ++- .../Enhancements/QoL/OcarinaTimeTravel.cpp | 9 ++++--- soh/soh/Enhancements/QoL/OpenAllHours.cpp | 2 +- soh/soh/Enhancements/QoL/PauseWarp.cpp | 5 +--- soh/soh/Enhancements/QoL/RebottleBlueFire.cpp | 2 +- soh/soh/Enhancements/QoL/ResetNaviTimer.cpp | 2 +- .../Enhancements/QoL/ReworkedTargeting.cpp | 2 -- .../Enhancements/QoL/SkipWarpAnimation.cpp | 4 +-- soh/soh/Enhancements/ResetGameplayFrames.cpp | 2 +- .../Restorations/BottleAdventure.cpp | 2 +- .../Restorations/GetItemManipulation.cpp | 7 ++--- .../Restorations/GraveHoleJumps.cpp | 7 ++--- .../Restorations/PauseBufferInputs.cpp | 8 ++---- .../Restorations/WideShutterDoorRanges.cpp | 3 ++- soh/soh/Enhancements/SpeedModifiers.cpp | 1 - soh/soh/Enhancements/SwitchAge.cpp | 2 -- .../Enhancements/TimeDisplay/TimeDisplay.cpp | 16 +++++------- .../Enhancements/TimeSavers/DampeAllNight.cpp | 1 - .../TimeSavers/FasterHeavyBlockLift.cpp | 1 - .../TimeSavers/FasterRupeeAccumulator.cpp | 1 - .../Enhancements/TimeSavers/ImprovedRoll.cpp | 5 ++-- .../Enhancements/TimeSavers/MarketSneak.cpp | 3 --- .../TimeSavers/SkipCutscene/SkipIntro.cpp | 1 - .../SkipCutscene/Story/Twinrova.cpp | 3 --- .../TimeSavers/SkipWaterGateDelay.cpp | 2 +- soh/soh/Enhancements/Warping.cpp | 7 +++-- soh/soh/Enhancements/audio/AudioEditor.cpp | 9 +++---- soh/soh/Enhancements/audio/AudioHooks.cpp | 7 +++-- .../Enhancements/audio/EnemyBGMDisable.cpp | 2 +- soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp | 2 +- soh/soh/Enhancements/boss-rush/BossRush.cpp | 15 +++++------ soh/soh/Enhancements/controls/InputViewer.cpp | 9 +++---- soh/soh/Enhancements/controls/Mouse.cpp | 15 +++++++---- soh/soh/Enhancements/controls/Mouse.h | 2 +- .../controls/SohInputEditorWindow.cpp | 10 ++++--- .../controls/SohInputEditorWindow.h | 3 ++- .../A11yNoScreenFlashForFinishingBlow.cpp | 3 +-- .../cosmetics/CustomSkeletons.cpp | 3 +-- .../cosmetics/FileSelectMoreInfo.cpp | 16 +++++++----- .../Enhancements/cosmetics/NoMasterSword.cpp | 5 ++-- .../cosmetics/TimeFlowFileSelect.cpp | 5 +++- .../cosmetics/authenticGfxPatches.cpp | 3 ++- soh/soh/Enhancements/debugconsole.cpp | 13 +++++----- .../Enhancements/debugger/MessageViewer.cpp | 12 ++++----- soh/soh/Enhancements/debugger/actorViewer.cpp | 12 ++++----- .../Enhancements/debugger/debugSaveEditor.cpp | 24 +++++++---------- soh/soh/Enhancements/debugger/dlViewer.cpp | 17 ++++++------ soh/soh/Enhancements/gameconsole.c | 1 - soh/soh/Enhancements/gameplaystats.cpp | 10 +++---- soh/soh/Enhancements/kaleido.cpp | 22 +++++++--------- soh/soh/Enhancements/nametag.h | 2 +- .../randomizer/3drando/hint_list.cpp | 1 - .../randomizer/3drando/item_pool.cpp | 8 +++--- .../randomizer/3drando/item_pool.hpp | 2 +- .../Enhancements/randomizer/3drando/menu.hpp | 2 +- .../Enhancements/randomizer/3drando/shops.cpp | 11 ++++---- .../randomizer/3drando/starting_inventory.cpp | 3 --- .../randomizer/3drando/starting_inventory.hpp | 2 +- soh/soh/Enhancements/randomizer/BigPoes.cpp | 6 +++-- .../randomizer/LakeHyliaWaterControl.cpp | 12 ++++----- .../randomizer/LockOverworldDoors.cpp | 5 ++-- .../randomizer/Messages/EntranceHints.cpp | 2 +- .../randomizer/Messages/Goron.cpp | 6 ++++- .../randomizer/Messages/GossipStoneHints.cpp | 6 +++-- .../randomizer/Messages/ItemMessages.cpp | 8 +++--- .../randomizer/Messages/MerchantMessages.cpp | 4 +-- .../Enhancements/randomizer/Messages/Navi.cpp | 6 ++++- .../randomizer/Messages/Rupees.cpp | 6 ++++- .../randomizer/Messages/StaticHints.cpp | 9 ++++--- .../Enhancements/randomizer/Plandomizer.cpp | 19 ++++++-------- soh/soh/Enhancements/randomizer/RCToRandInf.h | 2 +- .../Enhancements/randomizer/RocsFeather.cpp | 6 ++--- .../Enhancements/randomizer/ShuffleCrates.cpp | 5 +--- .../randomizer/ShuffleIcicles.cpp | 1 - .../Enhancements/randomizer/ShuffleRocks.cpp | 1 - .../Enhancements/randomizer/ShuffleSilver.h | 2 +- .../randomizer/ShuffleTreasureChestGame.cpp | 2 +- .../Enhancements/randomizer/ShuffleTrees.cpp | 3 +-- .../Enhancements/randomizer/bean_patches.h | 2 +- soh/soh/Enhancements/randomizer/draw.cpp | 6 +---- .../Enhancements/randomizer/fishsanity.cpp | 12 ++++----- soh/soh/Enhancements/randomizer/fishsanity.h | 1 - soh/soh/Enhancements/randomizer/hint.cpp | 1 - .../Enhancements/randomizer/hook_handlers.cpp | 1 - soh/soh/Enhancements/randomizer/item.cpp | 10 +++---- soh/soh/Enhancements/randomizer/item.h | 1 - .../Enhancements/randomizer/item_location.cpp | 5 ++-- soh/soh/Enhancements/randomizer/logic.cpp | 14 +++++----- soh/soh/Enhancements/randomizer/option.cpp | 6 ++--- .../Enhancements/randomizer/randomizer.cpp | 22 ++++++++-------- .../randomizer/randomizerEnumStrings.cpp | 6 ----- .../randomizer/randomizer_check_tracker.cpp | 25 +++++++++--------- .../randomizer/randomizer_entrance.c | 4 ++- .../randomizer/randomizer_grotto.c | 2 +- .../randomizer/randomizer_hint_tracker.cpp | 23 ++++++++-------- .../randomizer/randomizer_hint_tracker.h | 1 - soh/soh/Enhancements/randomizer/savefile.cpp | 7 ++--- soh/soh/Enhancements/randomizer/settings.cpp | 11 ++++---- soh/soh/Enhancements/randomizer/settings.h | 1 - soh/soh/Enhancements/savestates.cpp | 12 ++++----- .../ESpeakSpeechSynthesizer.cpp | 6 +++-- .../speechsynthesizer/SpeechLogger.cpp | 3 ++- .../Enhancements/timesplits/TimeSplits.cpp | 8 +++--- soh/soh/Network/Anchor/Anchor.cpp | 6 ++--- soh/soh/Network/Anchor/AnchorRoomWindow.cpp | 5 ++-- soh/soh/Network/Anchor/HookHandlers.cpp | 3 --- .../Network/Anchor/Packets/DamagePlayer.cpp | 4 +-- .../Network/Anchor/Packets/DisableAnchor.cpp | 1 - .../Anchor/Packets/EntranceDiscovered.cpp | 4 +-- .../Network/Anchor/Packets/GameComplete.cpp | 4 +-- soh/soh/Network/Anchor/Packets/GiveItem.cpp | 7 +++-- soh/soh/Network/Anchor/Packets/Handshake.cpp | 4 +-- .../Anchor/Packets/RequestTeleport.cpp | 4 +-- .../Network/Anchor/Packets/SetCheckStatus.cpp | 4 +-- soh/soh/Network/Anchor/Packets/SetFlag.cpp | 6 ++--- soh/soh/Network/Anchor/Packets/UnsetFlag.cpp | 5 ++-- .../Anchor/Packets/UpdateBeansCount.cpp | 4 +-- .../Anchor/Packets/UpdateRoomState.cpp | 5 ++-- soh/soh/Network/CrowdControl/CrowdControl.cpp | 6 ++--- soh/soh/OTRGlobals.cpp | 4 --- soh/soh/ResourceManagerHelpers.cpp | 26 ++++++++++--------- soh/soh/SaveManager.cpp | 5 ++-- soh/soh/SohGui/ImGuiUtils.cpp | 9 +++---- soh/soh/SohGui/Menu.cpp | 12 +++++---- soh/soh/SohGui/ResolutionEditor.cpp | 7 +++-- soh/soh/SohGui/SohGui.cpp | 5 ++-- soh/soh/SohGui/SohMenu.cpp | 4 +-- soh/soh/SohGui/SohMenuDevTools.cpp | 4 ++- soh/soh/SohGui/SohMenuNetwork.cpp | 1 - soh/soh/SohGui/SohMenuRandomizer.cpp | 2 +- soh/soh/SohGui/SohMenuStartingItems.cpp | 12 +++------ soh/soh/SohGui/UIWidgets.cpp | 2 +- soh/soh/framebuffer_effects.c | 2 +- soh/soh/framebuffer_effects.h | 2 +- soh/soh/gu_pc.c | 3 ++- soh/soh/mixer.c | 3 ++- soh/soh/resource/importer/ArrayFactory.cpp | 4 +-- .../resource/importer/AudioSampleFactory.cpp | 16 +++++++----- .../importer/AudioSequenceFactory.cpp | 12 ++++----- .../resource/importer/BackgroundFactory.cpp | 1 - .../importer/CollisionHeaderFactory.cpp | 4 +-- soh/soh/resource/importer/PathFactory.cpp | 6 ++--- .../importer/PlayerAnimationFactory.cpp | 1 - .../resource/importer/SkeletonLimbFactory.cpp | 6 ++--- soh/soh/resource/importer/TextFactory.cpp | 4 +-- .../scenecommand/EndMarkerFactory.cpp | 1 - .../scenecommand/SceneCommandFactory.cpp | 1 - .../scenecommand/SetActorListFactory.cpp | 4 +-- .../scenecommand/SetCameraSettingsFactory.cpp | 4 +-- .../scenecommand/SetCsCameraFactory.cpp | 1 - .../scenecommand/SetEchoSettingsFactory.cpp | 4 +-- .../scenecommand/SetEntranceListFactory.cpp | 4 +-- .../scenecommand/SetExitListFactory.cpp | 4 +-- .../scenecommand/SetLightListFactory.cpp | 4 +-- .../SetLightingSettingsFactory.cpp | 4 +-- .../importer/scenecommand/SetMeshFactory.cpp | 7 +++-- .../scenecommand/SetObjectListFactory.cpp | 4 +-- .../scenecommand/SetRoomBehaviorFactory.cpp | 4 +-- .../scenecommand/SetRoomListFactory.cpp | 6 ++--- .../scenecommand/SetSkyboxModifierFactory.cpp | 4 +-- .../scenecommand/SetSkyboxSettingsFactory.cpp | 4 +-- .../scenecommand/SetSoundSettingsFactory.cpp | 4 +-- .../scenecommand/SetSpecialObjectsFactory.cpp | 4 +-- .../SetStartPositionListFactory.cpp | 4 +-- .../scenecommand/SetTimeSettingsFactory.cpp | 4 +-- .../SetTransitionActorListFactory.cpp | 4 +-- .../scenecommand/SetWindSettingsFactory.cpp | 4 +-- soh/soh/resource/logging/PathLogger.h | 1 - .../resource/logging/SceneCommandLoggers.h | 1 - soh/soh/resource/type/CollisionHeader.h | 1 - soh/soh/resource/type/Cutscene.cpp | 1 - soh/soh/resource/type/PlayerAnimation.cpp | 1 - soh/soh/resource/type/Skeleton.cpp | 12 ++++----- soh/soh/resource/type/SkeletonLimb.h | 1 - soh/soh/resource/type/Text.h | 1 - .../resource/type/scenecommand/EndMarker.h | 1 - .../type/scenecommand/SetCameraSettings.h | 1 - .../resource/type/scenecommand/SetCsCamera.h | 1 - .../type/scenecommand/SetEchoSettings.h | 1 - .../type/scenecommand/SetEntranceList.h | 1 - .../resource/type/scenecommand/SetLightList.h | 1 - soh/soh/resource/type/scenecommand/SetMesh.h | 2 -- .../type/scenecommand/SetObjectList.h | 1 - .../type/scenecommand/SetRoomBehavior.h | 1 - .../resource/type/scenecommand/SetRoomList.h | 1 - .../type/scenecommand/SetSkyboxModifier.h | 1 - .../type/scenecommand/SetSkyboxSettings.h | 1 - .../type/scenecommand/SetSoundSettings.h | 1 - .../type/scenecommand/SetSpecialObjects.h | 1 - .../scenecommand/SetTransitionActorList.h | 1 - .../type/scenecommand/SetWindSettings.h | 1 - soh/soh/stubs.c | 2 +- soh/soh/util.cpp | 9 ++++--- soh/soh/z_message_OTR.cpp | 6 +++-- soh/soh/z_play_otr.cpp | 11 +++++--- soh/soh/z_scene_otr.cpp | 21 +++++++++------ 266 files changed, 592 insertions(+), 671 deletions(-) diff --git a/soh/soh/Enhancements/ActorSkeletonUnregister.c b/soh/soh/Enhancements/ActorSkeletonUnregister.c index a0c66aa86e..dd1571a068 100644 --- a/soh/soh/Enhancements/ActorSkeletonUnregister.c +++ b/soh/soh/Enhancements/ActorSkeletonUnregister.c @@ -3,7 +3,6 @@ #include "soh/ResourceManagerHelpers.h" -#include "z64.h" #include "include/z64player.h" #include "src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h" #include "src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h" @@ -114,7 +113,6 @@ #include "src/overlays/actors/ovl_En_Test/z_en_test.h" #include "src/overlays/actors/ovl_En_Tite/z_en_tite.h" #include "src/overlays/actors/ovl_En_Tk/z_en_tk.h" -#include "src/overlays/actors/ovl_En_Torch2/z_en_torch2.h" #include "src/overlays/actors/ovl_En_Toryo/z_en_toryo.h" #include "src/overlays/actors/ovl_En_Tr/z_en_tr.h" #include "src/overlays/actors/ovl_En_Vali/z_en_vali.h" diff --git a/soh/soh/Enhancements/BunnyHood.cpp b/soh/soh/Enhancements/BunnyHood.cpp index 175c8424c5..05def73f9f 100644 --- a/soh/soh/Enhancements/BunnyHood.cpp +++ b/soh/soh/Enhancements/BunnyHood.cpp @@ -5,7 +5,6 @@ extern "C" { #include "z64.h" -#include "functions.h" #include "macros.h" #include "variables.h" extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/Cheats/DekuStick.cpp b/soh/soh/Enhancements/Cheats/DekuStick.cpp index 5f19be7a90..d4c727022e 100644 --- a/soh/soh/Enhancements/Cheats/DekuStick.cpp +++ b/soh/soh/Enhancements/Cheats/DekuStick.cpp @@ -1,12 +1,12 @@ #include "soh/Enhancements/enhancementTypes.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" extern "C" { -extern PlayState* gPlayState; #include "z64.h" #include "macros.h" +extern PlayState* gPlayState; } #define CVAR_DEKU_STICK_NAME CVAR_CHEAT("DekuStick") diff --git a/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp b/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp index 1c1506b503..f56b7fb850 100644 --- a/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp +++ b/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp @@ -2,7 +2,6 @@ #include "soh/ShipInit.hpp" extern "C" { -#include "variables.h" #include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h" } diff --git a/soh/soh/Enhancements/Cheats/EasyISG.cpp b/soh/soh/Enhancements/Cheats/EasyISG.cpp index 07b4c7326a..777e3279e1 100644 --- a/soh/soh/Enhancements/Cheats/EasyISG.cpp +++ b/soh/soh/Enhancements/Cheats/EasyISG.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" diff --git a/soh/soh/Enhancements/Cheats/EasyQPA.cpp b/soh/soh/Enhancements/Cheats/EasyQPA.cpp index 4391a406da..8b8e3ca2a2 100644 --- a/soh/soh/Enhancements/Cheats/EasyQPA.cpp +++ b/soh/soh/Enhancements/Cheats/EasyQPA.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Cheats/FreezeTime.cpp b/soh/soh/Enhancements/Cheats/FreezeTime.cpp index 4c38e2870d..201b81bfcb 100644 --- a/soh/soh/Enhancements/Cheats/FreezeTime.cpp +++ b/soh/soh/Enhancements/Cheats/FreezeTime.cpp @@ -1,6 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" + +extern "C" { #include "z64save.h" +} extern "C" SaveContext gSaveContext; diff --git a/soh/soh/Enhancements/Cheats/GSTargetable.cpp b/soh/soh/Enhancements/Cheats/GSTargetable.cpp index 47dc918044..980baaa565 100644 --- a/soh/soh/Enhancements/Cheats/GSTargetable.cpp +++ b/soh/soh/Enhancements/Cheats/GSTargetable.cpp @@ -1,12 +1,13 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" -#include "soh/ShipInit.hpp" -#include #include +#include + +#include "soh/Enhancements/game-interactor/GameInteractor.h" +#include "soh/ShipInit.hpp" + extern "C" { #include "functions.h" #include "src/overlays/actors/ovl_En_Sw/z_en_sw.h" - extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp b/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp index 9ef5a1f21a..36d5dcb7d2 100644 --- a/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp +++ b/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp @@ -1,13 +1,13 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/SeedContext.h" #include "soh/OTRGlobals.h" #include "soh/ShipInit.hpp" -#include "z64save.h" extern "C" { -extern SaveContext gSaveContext; +#include "z64save.h" #include "variables.h" #include "macros.h" +extern SaveContext gSaveContext; } #define CVAR_INFINITE_AMMO_NAME CVAR_CHEAT("InfiniteAmmo") diff --git a/soh/soh/Enhancements/Cheats/Infinite/Health.cpp b/soh/soh/Enhancements/Cheats/Infinite/Health.cpp index 35f413d4ad..eb7b58912d 100644 --- a/soh/soh/Enhancements/Cheats/Infinite/Health.cpp +++ b/soh/soh/Enhancements/Cheats/Infinite/Health.cpp @@ -1,6 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" + +extern "C" { #include "z64save.h" +} extern "C" SaveContext gSaveContext; diff --git a/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp b/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp index aca55d7149..61c9ec4116 100644 --- a/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp +++ b/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Cheats/Infinite/Money.cpp b/soh/soh/Enhancements/Cheats/Infinite/Money.cpp index ac9a4b351b..c590f783a2 100644 --- a/soh/soh/Enhancements/Cheats/Infinite/Money.cpp +++ b/soh/soh/Enhancements/Cheats/Infinite/Money.cpp @@ -1,12 +1,12 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" -#include "z64save.h" -#include "variables.h" extern "C" { +#include "z64save.h" +#include "variables.h" +#include "macros.h" extern SaveContext gSaveContext; extern s32 Flags_GetRandomizerInf(RandomizerInf flag); -#include "macros.h" } #define CVAR_INFINITE_MONEY_NAME CVAR_CHEAT("InfiniteMoney") diff --git a/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp b/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp index 732437d499..a9eeebcf29 100644 --- a/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp +++ b/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp @@ -1,6 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" + +extern "C" { #include "z64save.h" +} extern "C" SaveContext gSaveContext; diff --git a/soh/soh/Enhancements/Cheats/MoonJump.cpp b/soh/soh/Enhancements/Cheats/MoonJump.cpp index 71035168a4..79686292b1 100644 --- a/soh/soh/Enhancements/Cheats/MoonJump.cpp +++ b/soh/soh/Enhancements/Cheats/MoonJump.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" diff --git a/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp b/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp index a15374880b..82ffd0b0bd 100644 --- a/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp +++ b/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp @@ -1,9 +1,8 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { #include "src/overlays/actors/ovl_En_Insect/z_en_insect.h" - extern s16 sDroppedCount; } diff --git a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp index 8185439567..907c511498 100644 --- a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp +++ b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" diff --git a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp index 45adbd01d9..c02962fe5e 100644 --- a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp +++ b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" diff --git a/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp b/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp index 5b1d29b46e..cf8965645f 100644 --- a/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp +++ b/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp @@ -1,9 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { -extern PlayState* gPlayState; #include "z64.h" +extern PlayState* gPlayState; } #define CVAR_UNRESTRICTED_ITEMS_NAME CVAR_CHEAT("NoRestrictItems") diff --git a/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp b/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp index 480a9de92a..97c1477a13 100644 --- a/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp +++ b/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" diff --git a/soh/soh/Enhancements/Difficulty/BonkDamage.cpp b/soh/soh/Enhancements/Difficulty/BonkDamage.cpp index 256c46be8c..c8bedaa5ff 100644 --- a/soh/soh/Enhancements/Difficulty/BonkDamage.cpp +++ b/soh/soh/Enhancements/Difficulty/BonkDamage.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/Enhancements/enhancementTypes.h" diff --git a/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp b/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp index f1d5a2349c..943c9f9211 100644 --- a/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp +++ b/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp @@ -1,9 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { -extern PlayState* gPlayState; #include "src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h" +extern PlayState* gPlayState; } static constexpr int32_t CVAR_CUCCOS_TO_RETURN_DEFAULT = 7; diff --git a/soh/soh/Enhancements/Difficulty/DampeFire.cpp b/soh/soh/Enhancements/Difficulty/DampeFire.cpp index 13afc88f0c..29251771d7 100644 --- a/soh/soh/Enhancements/Difficulty/DampeFire.cpp +++ b/soh/soh/Enhancements/Difficulty/DampeFire.cpp @@ -1,10 +1,10 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/Enhancements/enhancementTypes.h" extern "C" { -extern PlayState* gPlayState; #include "src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h" +extern PlayState* gPlayState; } static constexpr DampeDropRate CVAR_DAMPE_DROP_RATE_DEFAULT = DAMPE_NORMAL; diff --git a/soh/soh/Enhancements/Difficulty/HyperBosses.cpp b/soh/soh/Enhancements/Difficulty/HyperBosses.cpp index 2b21437b34..ae0603fdf6 100644 --- a/soh/soh/Enhancements/Difficulty/HyperBosses.cpp +++ b/soh/soh/Enhancements/Difficulty/HyperBosses.cpp @@ -1,9 +1,12 @@ #include "soh/ShipInit.hpp" +#include "soh/Enhancements/game-interactor/GameInteractor.h" +#include "soh/Enhancements/boss-rush/BossRush.h" + +extern "C" { #include "functions.h" #include "macros.h" #include "variables.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" -#include "soh/Enhancements/boss-rush/BossRush.h" +} extern "C" PlayState* gPlayState; diff --git a/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp b/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp index 42f7c9cc15..6ce4faf205 100644 --- a/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp +++ b/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp @@ -1,7 +1,10 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" + +extern "C" { #include "functions.h" #include "macros.h" +} extern "C" PlayState* gPlayState; diff --git a/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp b/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp index de9e6c1f1a..4c66849057 100644 --- a/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp +++ b/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp @@ -1,14 +1,13 @@ #include #include -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/randomizer.h" #include "soh/OTRGlobals.h" #include "soh/SaveManager.h" #include "soh/ShipInit.hpp" extern "C" { -#include "functions.h" #include "variables.h" #include "z64save.h" extern SaveContext gSaveContext; diff --git a/soh/soh/Enhancements/Difficulty/SwitchTimerMultiplier.cpp b/soh/soh/Enhancements/Difficulty/SwitchTimerMultiplier.cpp index 9c1f902711..872a7f4e1b 100644 --- a/soh/soh/Enhancements/Difficulty/SwitchTimerMultiplier.cpp +++ b/soh/soh/Enhancements/Difficulty/SwitchTimerMultiplier.cpp @@ -1,6 +1,7 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" + extern "C" { #include "z64.h" extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/Difficulty/TreesDropSticks.cpp b/soh/soh/Enhancements/Difficulty/TreesDropSticks.cpp index 9bf8689770..a8505c21e8 100644 --- a/soh/soh/Enhancements/Difficulty/TreesDropSticks.cpp +++ b/soh/soh/Enhancements/Difficulty/TreesDropSticks.cpp @@ -1,7 +1,8 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { +#include "functions.h" #include "src/overlays/actors/ovl_En_Wood02/z_en_wood02.h" } diff --git a/soh/soh/Enhancements/DropThrowOnlyActors.cpp b/soh/soh/Enhancements/DropThrowOnlyActors.cpp index d00b1c8875..a6dd264457 100644 --- a/soh/soh/Enhancements/DropThrowOnlyActors.cpp +++ b/soh/soh/Enhancements/DropThrowOnlyActors.cpp @@ -1,5 +1,4 @@ #include -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" diff --git a/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp b/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp index 018ffb38f7..8021e62700 100644 --- a/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp +++ b/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/ExtraModes/HurtContainer.cpp b/soh/soh/Enhancements/ExtraModes/HurtContainer.cpp index 35888e842c..6b016359e9 100644 --- a/soh/soh/Enhancements/ExtraModes/HurtContainer.cpp +++ b/soh/soh/Enhancements/ExtraModes/HurtContainer.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/ExtraModes/IvanCoop.cpp b/soh/soh/Enhancements/ExtraModes/IvanCoop.cpp index 00f5c49bc1..98132cd262 100644 --- a/soh/soh/Enhancements/ExtraModes/IvanCoop.cpp +++ b/soh/soh/Enhancements/ExtraModes/IvanCoop.cpp @@ -1,9 +1,9 @@ #include "soh/ActorDB.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" -#include "src/overlays/actors/ovl_En_Partner/z_en_partner.h" extern "C" { +#include "src/overlays/actors/ovl_En_Partner/z_en_partner.h" #include "macros.h" #include "functions.h" extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/ExtraModes/RandomizedEnemySizes.cpp b/soh/soh/Enhancements/ExtraModes/RandomizedEnemySizes.cpp index 68284a4838..d94a1af99c 100644 --- a/soh/soh/Enhancements/ExtraModes/RandomizedEnemySizes.cpp +++ b/soh/soh/Enhancements/ExtraModes/RandomizedEnemySizes.cpp @@ -5,7 +5,6 @@ extern "C" { #include "functions.h" -#include "src/overlays/actors/ovl_En_Fz/z_en_fz.h" #include "src/overlays/actors/ovl_En_Crow/z_en_crow.h" #include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h" extern void EnCrow_TurnAway(EnCrow*, PlayState*); diff --git a/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp index 17d457ef23..24c7681f88 100644 --- a/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp +++ b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp index abe9144daf..1bb5e2829e 100644 --- a/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp +++ b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp @@ -1,6 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" + +extern "C" { #include "functions.h" +} extern "C" PlayState* gPlayState; diff --git a/soh/soh/Enhancements/FileSelectEnhancements.h b/soh/soh/Enhancements/FileSelectEnhancements.h index 4aeea89cbf..6ee38de50f 100644 --- a/soh/soh/Enhancements/FileSelectEnhancements.h +++ b/soh/soh/Enhancements/FileSelectEnhancements.h @@ -1,6 +1,6 @@ #pragma once -#include "z64.h" +#include #ifdef __cplusplus extern "C" { diff --git a/soh/soh/Enhancements/Fixes/BrokenGiantsKnife.cpp b/soh/soh/Enhancements/Fixes/BrokenGiantsKnife.cpp index 1d4a55f5d8..5ea9fb9166 100644 --- a/soh/soh/Enhancements/Fixes/BrokenGiantsKnife.cpp +++ b/soh/soh/Enhancements/Fixes/BrokenGiantsKnife.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Fixes/DampeGoingBackwards.cpp b/soh/soh/Enhancements/Fixes/DampeGoingBackwards.cpp index be5b25a589..85e227a033 100644 --- a/soh/soh/Enhancements/Fixes/DampeGoingBackwards.cpp +++ b/soh/soh/Enhancements/Fixes/DampeGoingBackwards.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Fixes/DekuNutUpgradeFix.cpp b/soh/soh/Enhancements/Fixes/DekuNutUpgradeFix.cpp index 23e0a1fd63..d9e70fa90b 100644 --- a/soh/soh/Enhancements/Fixes/DekuNutUpgradeFix.cpp +++ b/soh/soh/Enhancements/Fixes/DekuNutUpgradeFix.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Fixes/DirtPathFix.cpp b/soh/soh/Enhancements/Fixes/DirtPathFix.cpp index 023e8f2c81..e9acff6eec 100644 --- a/soh/soh/Enhancements/Fixes/DirtPathFix.cpp +++ b/soh/soh/Enhancements/Fixes/DirtPathFix.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/enhancementTypes.h" #include "soh/ShipInit.hpp" diff --git a/soh/soh/Enhancements/Fixes/FixFlexDrops.cpp b/soh/soh/Enhancements/Fixes/FixFlexDrops.cpp index 6efcbf5650..eb088e234f 100644 --- a/soh/soh/Enhancements/Fixes/FixFlexDrops.cpp +++ b/soh/soh/Enhancements/Fixes/FixFlexDrops.cpp @@ -1,8 +1,8 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" +#include "soh/cvar_prefixes.h" extern "C" { -#include "z64.h" // Converts a drop id based on age, health and owned items. Returns -1 when the drop can't be given. s16 func_8001F404(s16 dropId); } diff --git a/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp b/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp index d0525ac6a1..9c0627f48c 100644 --- a/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp +++ b/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp b/soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp index a49c086d87..657c499901 100644 --- a/soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp +++ b/soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp @@ -1,9 +1,8 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ResourceManagerHelpers.h" #include "soh/ShipInit.hpp" extern "C" { -#include "variables.h" #include "src/overlays/actors/ovl_En_Door/z_en_door.h" extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/Fixes/FloorSwitches.cpp b/soh/soh/Enhancements/Fixes/FloorSwitches.cpp index 86b13d5139..d1a164a933 100644 --- a/soh/soh/Enhancements/Fixes/FloorSwitches.cpp +++ b/soh/soh/Enhancements/Fixes/FloorSwitches.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Fixes/HammerHandFix.cpp b/soh/soh/Enhancements/Fixes/HammerHandFix.cpp index 2d0da17953..1f6b657089 100644 --- a/soh/soh/Enhancements/Fixes/HammerHandFix.cpp +++ b/soh/soh/Enhancements/Fixes/HammerHandFix.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ResourceManagerHelpers.h" #include "soh/ShipInit.hpp" diff --git a/soh/soh/Enhancements/GameplayStats/BossDefeatTimestamps.cpp b/soh/soh/Enhancements/GameplayStats/BossDefeatTimestamps.cpp index 06e95107ba..7c57ed7dca 100644 --- a/soh/soh/Enhancements/GameplayStats/BossDefeatTimestamps.cpp +++ b/soh/soh/Enhancements/GameplayStats/BossDefeatTimestamps.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp b/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp index 7a8dccce35..9ae7158502 100644 --- a/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp +++ b/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { @@ -13,7 +13,6 @@ extern "C" { #include "src/overlays/actors/ovl_En_Poh/z_en_poh.h" #include "src/overlays/actors/ovl_En_Tp/z_en_tp.h" #include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h" - extern SaveContext gSaveContext; } diff --git a/soh/soh/Enhancements/Graphics/AgeDependentEquipment.cpp b/soh/soh/Enhancements/Graphics/AgeDependentEquipment.cpp index b24bd54ba8..b99fe28011 100644 --- a/soh/soh/Enhancements/Graphics/AgeDependentEquipment.cpp +++ b/soh/soh/Enhancements/Graphics/AgeDependentEquipment.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/ResourceManagerHelpers.h" diff --git a/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp b/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp index 9bf42d5c7b..fb17fdcf35 100644 --- a/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp +++ b/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/resource/type/scenecommand/SetTimeSettings.h" diff --git a/soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp b/soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp index ad4a6e6d38..b2c50e9bc8 100644 --- a/soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp +++ b/soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp @@ -1,8 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" -#include "soh/ShipInit.hpp" #include #include +#include "soh/Enhancements/game-interactor/GameInteractor.h" +#include "soh/ShipInit.hpp" + extern "C" { #include "functions.h" #include "variables.h" diff --git a/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp b/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp index 654aef3880..bd41f13480 100644 --- a/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp +++ b/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp b/soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp index 7425495042..561150d4b3 100644 --- a/soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp +++ b/soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Graphics/ToTMedallions.cpp b/soh/soh/Enhancements/Graphics/ToTMedallions.cpp index 78cca02002..2e1aea757f 100644 --- a/soh/soh/Enhancements/Graphics/ToTMedallions.cpp +++ b/soh/soh/Enhancements/Graphics/ToTMedallions.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ResourceManagerHelpers.h" #include "soh/ShipInit.hpp" diff --git a/soh/soh/Enhancements/Items/ArrowCycle.cpp b/soh/soh/Enhancements/Items/ArrowCycle.cpp index beb6ac2f67..cf974041c6 100644 --- a/soh/soh/Enhancements/Items/ArrowCycle.cpp +++ b/soh/soh/Enhancements/Items/ArrowCycle.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { @@ -7,10 +7,8 @@ extern "C" { #include "variables.h" #include "functions.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" - s32 func_808351D4(Player* thisx, PlayState* play); // Arrow nocked void EnArrow_Init(Actor* thisx, PlayState* play); - extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp b/soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp index 50dc0621dd..ec4576a9a9 100644 --- a/soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp +++ b/soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp @@ -1,11 +1,10 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { #include "z64.h" #include "macros.h" #include "variables.h" - extern s32 Player_GetItemOnButton(PlayState*, s32); extern void Inventory_ChangeEquipment(s16, u16); extern void Player_SetEquipmentData(PlayState*, Player*); diff --git a/soh/soh/Enhancements/Items/BlueFireArrows.cpp b/soh/soh/Enhancements/Items/BlueFireArrows.cpp index 985767853a..5f5fe8f2a1 100644 --- a/soh/soh/Enhancements/Items/BlueFireArrows.cpp +++ b/soh/soh/Enhancements/Items/BlueFireArrows.cpp @@ -1,11 +1,10 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/SeedContext.h" #include "soh/ShipInit.hpp" extern "C" { #include "overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h" #include "overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h" - extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/Items/ItemUnequip.cpp b/soh/soh/Enhancements/Items/ItemUnequip.cpp index 46896189cf..1f5057c781 100644 --- a/soh/soh/Enhancements/Items/ItemUnequip.cpp +++ b/soh/soh/Enhancements/Items/ItemUnequip.cpp @@ -6,7 +6,6 @@ extern "C" { #include "functions.h" #include "macros.h" #include "variables.h" -#include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h" extern SaveContext gSaveContext; } diff --git a/soh/soh/Enhancements/Items/MaskSelect.cpp b/soh/soh/Enhancements/Items/MaskSelect.cpp index 2d5d2bbe35..e0e5ecaa8d 100644 --- a/soh/soh/Enhancements/Items/MaskSelect.cpp +++ b/soh/soh/Enhancements/Items/MaskSelect.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Items/RemoteBombchu.cpp b/soh/soh/Enhancements/Items/RemoteBombchu.cpp index c34dc976a1..08561d9706 100644 --- a/soh/soh/Enhancements/Items/RemoteBombchu.cpp +++ b/soh/soh/Enhancements/Items/RemoteBombchu.cpp @@ -1,9 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { +#include "functions.h" #include "src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h" - void EnBomChu_Move(EnBomChu*, PlayState*); void EnBomChu_Explode(EnBomChu*, PlayState*); s32 Camera_BGCheck(Camera* camera, Vec3f* from, Vec3f* to); diff --git a/soh/soh/Enhancements/Items/SunlightArrows.cpp b/soh/soh/Enhancements/Items/SunlightArrows.cpp index 73e894c245..524e40eb67 100644 --- a/soh/soh/Enhancements/Items/SunlightArrows.cpp +++ b/soh/soh/Enhancements/Items/SunlightArrows.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/SeedContext.h" #include "soh/ShipInit.hpp" #include "soh/ObjectExtension/ObjectExtension.h" diff --git a/soh/soh/Enhancements/Lang/Lang.cpp b/soh/soh/Enhancements/Lang/Lang.cpp index 981e372c3f..4c44e06760 100644 --- a/soh/soh/Enhancements/Lang/Lang.cpp +++ b/soh/soh/Enhancements/Lang/Lang.cpp @@ -1,20 +1,17 @@ -#include "Lang.h" - -#include "soh/SohGui/MenuTypes.h" -#include "soh/SohGui/SohGui.hpp" -#include "soh/SohGui/SohMenu.h" -#include "soh/util.h" +#include +#include #include "ship/Context.h" #include "ship/resource/File.h" -#include "ship/resource/ResourceManager.h" #include "ship/resource/type/Json.h" #include "ship/utils/StringHelper.h" +#include "Lang.h" +#include "soh/SohGui/MenuTypes.h" +#include "soh/SohGui/SohMenu.h" +#include "soh/util.h" #include "spdlog/spdlog.h" -#include - namespace SohGui { extern std::shared_ptr mSohMenu; } diff --git a/soh/soh/Enhancements/Minigames/BombchuBowling.cpp b/soh/soh/Enhancements/Minigames/BombchuBowling.cpp index 1d734d7f15..63807f8420 100644 --- a/soh/soh/Enhancements/Minigames/BombchuBowling.cpp +++ b/soh/soh/Enhancements/Minigames/BombchuBowling.cpp @@ -1,5 +1,5 @@ #include "soh/Enhancements/enhancementTypes.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Minigames/DampeBothPrizes.cpp b/soh/soh/Enhancements/Minigames/DampeBothPrizes.cpp index 35fb97f45a..64e4d657b5 100644 --- a/soh/soh/Enhancements/Minigames/DampeBothPrizes.cpp +++ b/soh/soh/Enhancements/Minigames/DampeBothPrizes.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Minigames/DivingGameTimer.cpp b/soh/soh/Enhancements/Minigames/DivingGameTimer.cpp index ff5e717aa4..bd8afe5634 100644 --- a/soh/soh/Enhancements/Minigames/DivingGameTimer.cpp +++ b/soh/soh/Enhancements/Minigames/DivingGameTimer.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Minigames/FrogsOcarinaGame.cpp b/soh/soh/Enhancements/Minigames/FrogsOcarinaGame.cpp index ba4f20a90a..8133268c77 100644 --- a/soh/soh/Enhancements/Minigames/FrogsOcarinaGame.cpp +++ b/soh/soh/Enhancements/Minigames/FrogsOcarinaGame.cpp @@ -1,11 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { -#include "functions.h" #include "src/overlays/actors/ovl_En_Fr/z_en_fr.h" extern PlayState* gPlayState; - extern void EnFr_SetupReward(EnFr* enFr, PlayState* play, u8 unkCondition); } diff --git a/soh/soh/Enhancements/Minigames/HorsebackArchery.cpp b/soh/soh/Enhancements/Minigames/HorsebackArchery.cpp index 282662a76b..f3332fce02 100644 --- a/soh/soh/Enhancements/Minigames/HorsebackArchery.cpp +++ b/soh/soh/Enhancements/Minigames/HorsebackArchery.cpp @@ -1,11 +1,10 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { #include "functions.h" #include "src/overlays/actors/ovl_En_Ge1/z_en_ge1.h" extern SaveContext gSaveContext; - extern void EnGe1_TalkAfterGame_Archery(EnGe1* enGe1, PlayState* play); } diff --git a/soh/soh/Enhancements/Minigames/IngoRaceOnce.cpp b/soh/soh/Enhancements/Minigames/IngoRaceOnce.cpp index afcea2d14c..75ad1d2ecb 100644 --- a/soh/soh/Enhancements/Minigames/IngoRaceOnce.cpp +++ b/soh/soh/Enhancements/Minigames/IngoRaceOnce.cpp @@ -1,5 +1,5 @@ #include "soh/Enhancements/enhancementTypes.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Minigames/LostWoodsOcarinaGame.cpp b/soh/soh/Enhancements/Minigames/LostWoodsOcarinaGame.cpp index 18f926c3d2..3671c67d2d 100644 --- a/soh/soh/Enhancements/Minigames/LostWoodsOcarinaGame.cpp +++ b/soh/soh/Enhancements/Minigames/LostWoodsOcarinaGame.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { @@ -6,7 +6,6 @@ extern "C" { #include "variables.h" #include "src/overlays/actors/ovl_En_Skj/z_en_skj.h" extern PlayState* gPlayState; - void EnSkj_WaitForPlayback(EnSkj* enSkj, PlayState* play); } diff --git a/soh/soh/Enhancements/Minigames/ShootingGallery.cpp b/soh/soh/Enhancements/Minigames/ShootingGallery.cpp index 8af35223f4..fb44c15541 100644 --- a/soh/soh/Enhancements/Minigames/ShootingGallery.cpp +++ b/soh/soh/Enhancements/Minigames/ShootingGallery.cpp @@ -2,7 +2,6 @@ #include "soh/ShipInit.hpp" extern "C" { -#include "functions.h" #include "src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h" extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/QoL/DaytimeGS.cpp b/soh/soh/Enhancements/QoL/DaytimeGS.cpp index b6076ef406..f151b15f3f 100644 --- a/soh/soh/Enhancements/QoL/DaytimeGS.cpp +++ b/soh/soh/Enhancements/QoL/DaytimeGS.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/QoL/EasyButterflyFairies.cpp b/soh/soh/Enhancements/QoL/EasyButterflyFairies.cpp index 0faea5ee28..d7a2aea36f 100644 --- a/soh/soh/Enhancements/QoL/EasyButterflyFairies.cpp +++ b/soh/soh/Enhancements/QoL/EasyButterflyFairies.cpp @@ -4,7 +4,6 @@ extern "C" { #include "src/overlays/actors/ovl_En_Butte/z_en_butte.h" -#include "variables.h" extern void EnButte_SetupTransformIntoFairy(EnButte* enButte); } diff --git a/soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp b/soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp index 772955ecec..1c6907bc27 100644 --- a/soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp +++ b/soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp @@ -1,5 +1,6 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/randomizer/randomizer.h" +#include "soh/Enhancements/custom-message/CustomMessageTypes.h" +#include "soh/Enhancements/randomizer/SeedContext.h" extern "C" { #include "variables.h" diff --git a/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp b/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp index 9cbb3de053..d137233f37 100644 --- a/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp +++ b/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp @@ -1,10 +1,13 @@ #include "soh/ShipInit.hpp" +#include "soh/Enhancements/enhancementTypes.h" +#include "soh/Enhancements/SwitchAge.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" + +extern "C" { #include "functions.h" #include "macros.h" #include "variables.h" -#include "soh/Enhancements/enhancementTypes.h" -#include "soh/Enhancements/SwitchAge.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +} extern "C" PlayState* gPlayState; diff --git a/soh/soh/Enhancements/QoL/OpenAllHours.cpp b/soh/soh/Enhancements/QoL/OpenAllHours.cpp index fd8d1a2ad9..67d727406f 100644 --- a/soh/soh/Enhancements/QoL/OpenAllHours.cpp +++ b/soh/soh/Enhancements/QoL/OpenAllHours.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/randomizer.h" #include "soh/OTRGlobals.h" #include "soh/ShipInit.hpp" diff --git a/soh/soh/Enhancements/QoL/PauseWarp.cpp b/soh/soh/Enhancements/QoL/PauseWarp.cpp index 58f7ab5d49..21d93fc66d 100644 --- a/soh/soh/Enhancements/QoL/PauseWarp.cpp +++ b/soh/soh/Enhancements/QoL/PauseWarp.cpp @@ -1,15 +1,12 @@ -#include +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/custom-message/CustomMessageTypes.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/ShipInit.hpp" extern "C" { #include "functions.h" #include "macros.h" #include "variables.h" - extern PlayState* gPlayState; - u8 Randomizer_GetSettingValue(RandomizerSettingKey); } diff --git a/soh/soh/Enhancements/QoL/RebottleBlueFire.cpp b/soh/soh/Enhancements/QoL/RebottleBlueFire.cpp index 8ca11e4e62..ea68ef7b2d 100644 --- a/soh/soh/Enhancements/QoL/RebottleBlueFire.cpp +++ b/soh/soh/Enhancements/QoL/RebottleBlueFire.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/QoL/ResetNaviTimer.cpp b/soh/soh/Enhancements/QoL/ResetNaviTimer.cpp index b3048be538..137bcb8b70 100644 --- a/soh/soh/Enhancements/QoL/ResetNaviTimer.cpp +++ b/soh/soh/Enhancements/QoL/ResetNaviTimer.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp b/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp index 9ffc33f405..f4167b70f0 100644 --- a/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp +++ b/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp @@ -1,11 +1,9 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" -#include "soh/OTRGlobals.h" extern "C" { #include "z64.h" #include "macros.h" -#include "functions.h" extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/QoL/SkipWarpAnimation.cpp b/soh/soh/Enhancements/QoL/SkipWarpAnimation.cpp index 23c6198dca..778d509291 100644 --- a/soh/soh/Enhancements/QoL/SkipWarpAnimation.cpp +++ b/soh/soh/Enhancements/QoL/SkipWarpAnimation.cpp @@ -1,12 +1,10 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { #include "functions.h" -#include "macros.h" #include "variables.h" #include "z64save.h" - extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/ResetGameplayFrames.cpp b/soh/soh/Enhancements/ResetGameplayFrames.cpp index 3b234dbe58..d3a5a022ec 100644 --- a/soh/soh/Enhancements/ResetGameplayFrames.cpp +++ b/soh/soh/Enhancements/ResetGameplayFrames.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Restorations/BottleAdventure.cpp b/soh/soh/Enhancements/Restorations/BottleAdventure.cpp index ef4a8d4e8a..624bfa5710 100644 --- a/soh/soh/Enhancements/Restorations/BottleAdventure.cpp +++ b/soh/soh/Enhancements/Restorations/BottleAdventure.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Restorations/GetItemManipulation.cpp b/soh/soh/Enhancements/Restorations/GetItemManipulation.cpp index 9f0a92e699..78cb6b6958 100644 --- a/soh/soh/Enhancements/Restorations/GetItemManipulation.cpp +++ b/soh/soh/Enhancements/Restorations/GetItemManipulation.cpp @@ -1,13 +1,10 @@ +#include + #include "GetItemManipulation.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/Enhancements/item-tables/ItemTableManager.h" -#include "soh/OTRGlobals.h" -#include "soh/ShipInit.hpp" extern "C" { #include "z64.h" -#include "macros.h" -#include "variables.h" extern PlayState* gPlayState; GetItemID RetrieveGetItemIDFromItemID(ItemID itemID); } diff --git a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp index f36c07a483..2de8edad3a 100644 --- a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp +++ b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp @@ -1,11 +1,12 @@ +#include +#include + #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/ShipInit.hpp" -#include "functions.h" +#include "soh/cvar_prefixes.h" #include "soh/resource/type/Scene.h" #include "soh/resource/type/scenecommand/SceneCommand.h" #include "soh/resource/type/scenecommand/SetCollisionHeader.h" -#include -#include #define CVAR_GRAVE_HOLE_NAME CVAR_ENHANCEMENT("GraveHoles") #define GRAVE_HOLES_DEFAULT 0 diff --git a/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp b/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp index a9a1b61056..d3e1af9189 100644 --- a/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp +++ b/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp @@ -1,11 +1,7 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" +#include "soh/Enhancements/gameconsole.h" #include "soh/ShipInit.hpp" -extern "C" { -#include "variables.h" -#include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h" -} - #define CVAR_BUFFER_NAME CVAR_ENHANCEMENT("PauseBufferWindow") #define CVAR_BUFFER_DEFAULT 0 #define CVAR_BUFFER_VALUE CVarGetInteger(CVAR_BUFFER_NAME, CVAR_BUFFER_DEFAULT) diff --git a/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp b/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp index ce9b7e7a18..17a392462c 100644 --- a/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp +++ b/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp @@ -1,5 +1,6 @@ #include -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" + +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/SpeedModifiers.cpp b/soh/soh/Enhancements/SpeedModifiers.cpp index 9193485e99..b1a87a6aba 100644 --- a/soh/soh/Enhancements/SpeedModifiers.cpp +++ b/soh/soh/Enhancements/SpeedModifiers.cpp @@ -5,7 +5,6 @@ extern "C" { #include "z64.h" -#include "functions.h" #include "macros.h" #include "variables.h" extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/SwitchAge.cpp b/soh/soh/Enhancements/SwitchAge.cpp index a8ff5f19d0..71848f7eb1 100644 --- a/soh/soh/Enhancements/SwitchAge.cpp +++ b/soh/soh/Enhancements/SwitchAge.cpp @@ -5,8 +5,6 @@ extern "C" { #include #include "macros.h" #include "variables.h" -#include "functions.h" - extern SaveContext gSaveContext; extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp index 288b07abe0..fa82a76f89 100644 --- a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp +++ b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp @@ -1,19 +1,15 @@ -#include "TimeDisplay.h" -#include "soh/Enhancements/gameplaystats.h" -#include - -#include "assets/textures/parameter_static/parameter_static.h" -#include "assets/soh_assets.h" -#include "soh/SohGui/ImGuiUtils.h" - #include #include #include -#include + +#include "TimeDisplay.h" +#include "soh/Enhancements/gameplaystats.h" +#include "soh/SohGui/ImGuiUtils.h" extern "C" { +#include "assets/textures/parameter_static/parameter_static.h" +#include "assets/soh_assets.h" #include "macros.h" -#include "functions.h" #include "variables.h" extern PlayState* gPlayState; uint64_t GetUnixTimestamp(); diff --git a/soh/soh/Enhancements/TimeSavers/DampeAllNight.cpp b/soh/soh/Enhancements/TimeSavers/DampeAllNight.cpp index 683e7fbca1..73d608bd8f 100644 --- a/soh/soh/Enhancements/TimeSavers/DampeAllNight.cpp +++ b/soh/soh/Enhancements/TimeSavers/DampeAllNight.cpp @@ -1,5 +1,4 @@ #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" -#include "soh/OTRGlobals.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp index b5bf4424d5..caa43c61d6 100644 --- a/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp +++ b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp @@ -5,7 +5,6 @@ extern "C" { #include "z64.h" #include "z64save.h" #include "macros.h" -#include "variables.h" #include "functions.h" extern PlayState* gPlayState; extern SaveContext gSaveContext; diff --git a/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp b/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp index 730defe712..1bcbbfaa78 100644 --- a/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp +++ b/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp @@ -6,7 +6,6 @@ extern "C" { #include "z64save.h" #include "macros.h" #include "variables.h" -#include "functions.h" extern PlayState* gPlayState; extern SaveContext gSaveContext; } diff --git a/soh/soh/Enhancements/TimeSavers/ImprovedRoll.cpp b/soh/soh/Enhancements/TimeSavers/ImprovedRoll.cpp index 3c3edf54db..23fc3ed514 100644 --- a/soh/soh/Enhancements/TimeSavers/ImprovedRoll.cpp +++ b/soh/soh/Enhancements/TimeSavers/ImprovedRoll.cpp @@ -1,8 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" -#include "global.h" extern "C" { +#include "functions.h" +#include "macros.h" void Player_SetupRoll(Player* player, PlayState* play); } diff --git a/soh/soh/Enhancements/TimeSavers/MarketSneak.cpp b/soh/soh/Enhancements/TimeSavers/MarketSneak.cpp index ed1bd2b97b..bd74d0d59b 100644 --- a/soh/soh/Enhancements/TimeSavers/MarketSneak.cpp +++ b/soh/soh/Enhancements/TimeSavers/MarketSneak.cpp @@ -1,4 +1,3 @@ -#include #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/ShipInit.hpp" @@ -10,10 +9,8 @@ extern "C" { #include #include "overlays/actors/ovl_En_Heishi4/z_en_heishi4.h" extern PlayState* gPlayState; - // the guard's idle action func, restored once the sneak prompt is answered void func_80A56614(EnHeishi4* heishi, PlayState* play); - u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey); } diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp index e8d94d9e42..6a72312c6a 100644 --- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp +++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp @@ -5,7 +5,6 @@ extern "C" { #include "macros.h" #include "z64save.h" -#include "functions.h" #include "soh/Enhancements/randomizer/randomizer_entrance.h" extern PlayState* gPlayState; extern SaveContext gSaveContext; diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/Twinrova.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/Twinrova.cpp index 3e800fb681..cddc1472f7 100644 --- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/Twinrova.cpp +++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/Twinrova.cpp @@ -1,12 +1,9 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/ShipInit.hpp" extern "C" { -#include "variables.h" #include "seqcmd.h" #include "src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h" -#include "assets/objects/object_tw/object_tw.h" extern BossTw* sTwinrovaPtr; extern void BossTw_SetupFlyTo(BossTw*, PlayState*); extern void BossTw_SetupWait(BossTw*, PlayState*); diff --git a/soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp b/soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp index 22e7ed305f..51d0f0b5d4 100644 --- a/soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp +++ b/soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { diff --git a/soh/soh/Enhancements/Warping.cpp b/soh/soh/Enhancements/Warping.cpp index 93e0cd899a..50cb8fe0ca 100644 --- a/soh/soh/Enhancements/Warping.cpp +++ b/soh/soh/Enhancements/Warping.cpp @@ -1,16 +1,19 @@ #include #include + #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/ShipInit.hpp" -#include "functions.h" #include "soh/SohGui/MenuTypes.h" #include "soh/SohGui/UIWidgets.hpp" #include "soh/util.h" +#include "soh/Enhancements/gameconsole.h" extern "C" { +#include "functions.h" +#include "macros.h" +#include "variables.h" #include "z64.h" -#include "global.h" #include "soh/Enhancements/enhancementTypes.h" void Sram_InitDebugSave(void); void Select_LoadGame(SelectContext* selectContext, s32 entranceIndex); diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp index 95b22e4645..891a3d06a4 100644 --- a/soh/soh/Enhancements/audio/AudioEditor.cpp +++ b/soh/soh/Enhancements/audio/AudioEditor.cpp @@ -1,14 +1,11 @@ -#include "AudioEditor.h" -#include "sequence.h" - #include #include #include -#include + +#include "AudioEditor.h" #include "soh/ShipUtils.h" #include "soh/OTRGlobals.h" #include "soh/cvar_prefixes.h" -#include #include "soh/SohGui/SohMenu.h" #include "soh/SohGui/SohGui.hpp" #include "AudioCollection.h" @@ -18,6 +15,8 @@ #include "soh/Enhancements/randomizer/SeedContext.h" extern "C" { +#include "sequence.h" +#include #include "z64save.h" extern SaveContext gSaveContext; } diff --git a/soh/soh/Enhancements/audio/AudioHooks.cpp b/soh/soh/Enhancements/audio/AudioHooks.cpp index 00d9b9b50d..aad81b5424 100644 --- a/soh/soh/Enhancements/audio/AudioHooks.cpp +++ b/soh/soh/Enhancements/audio/AudioHooks.cpp @@ -1,13 +1,12 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include + +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "AudioCollection.h" #include -#include -#include extern "C" { #include "variables.h" - extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/audio/EnemyBGMDisable.cpp b/soh/soh/Enhancements/audio/EnemyBGMDisable.cpp index 0047f7cff7..8e7853ed0e 100644 --- a/soh/soh/Enhancements/audio/EnemyBGMDisable.cpp +++ b/soh/soh/Enhancements/audio/EnemyBGMDisable.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" diff --git a/soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp b/soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp index 423776e3c5..80c908547d 100644 --- a/soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp +++ b/soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp @@ -1,4 +1,4 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" #include "soh/cvar_prefixes.h" diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp index d71cbe8952..ae5e0e7f93 100644 --- a/soh/soh/Enhancements/boss-rush/BossRush.cpp +++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp @@ -1,16 +1,17 @@ +#include +#include +#include + +#include + #include "BossRush.h" #include "soh/ShipInit.hpp" #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" -#include "soh_assets.h" #include "soh/frame_interpolation.h" -#include -#include -#include -#include - extern "C" { +#include "soh_assets.h" #include "functions.h" #include "macros.h" #include "variables.h" @@ -22,9 +23,7 @@ extern "C" { #include "textures/icon_item_nes_static/icon_item_nes_static.h" #include "textures/icon_item_ger_static/icon_item_ger_static.h" #include "textures/icon_item_fra_static/icon_item_fra_static.h" - extern PlayState* gPlayState; - Gfx* KaleidoScope_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, u16 point); void FileChoose_UpdateStickDirectionPromptAnim(GameState* thisx); void FileChoose_DrawTextRec(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a, f32 x, f32 y, f32 z, s32 s, s32 t, diff --git a/soh/soh/Enhancements/controls/InputViewer.cpp b/soh/soh/Enhancements/controls/InputViewer.cpp index 161610e93c..53bfb9ba14 100644 --- a/soh/soh/Enhancements/controls/InputViewer.cpp +++ b/soh/soh/Enhancements/controls/InputViewer.cpp @@ -1,19 +1,16 @@ -#include "InputViewer.h" - #include #include "libultraship/libultra/controller.h" #include #include -#include "soh/OTRGlobals.h" #include #include -#include +#include +#include "InputViewer.h" +#include "soh/OTRGlobals.h" #include "soh/SohGui/UIWidgets.hpp" #include "soh/SohGui/SohGui.hpp" -#include - using namespace UIWidgets; // Text colors diff --git a/soh/soh/Enhancements/controls/Mouse.cpp b/soh/soh/Enhancements/controls/Mouse.cpp index 043b7f8992..c745c22de6 100644 --- a/soh/soh/Enhancements/controls/Mouse.cpp +++ b/soh/soh/Enhancements/controls/Mouse.cpp @@ -1,12 +1,17 @@ -#include "Mouse.h" -#include "soh/OTRGlobals.h" -#include "z64player.h" -#include "global.h" #include #include -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" + +#include "Mouse.h" +#include "soh/OTRGlobals.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" +extern "C" { +#include "z64player.h" +#include "functions.h" +#include "macros.h" +} + static Ship::Coords mouseCoord = {}; static Ship::Coords mouseCoordRel = {}; diff --git a/soh/soh/Enhancements/controls/Mouse.h b/soh/soh/Enhancements/controls/Mouse.h index c22d9ac5c0..ea10a6150b 100644 --- a/soh/soh/Enhancements/controls/Mouse.h +++ b/soh/soh/Enhancements/controls/Mouse.h @@ -1,6 +1,6 @@ #pragma once -#include +#include struct Player; diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp index f611399227..74fa7d9898 100644 --- a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp +++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp @@ -1,13 +1,17 @@ -#include "SohInputEditorWindow.h" #include #include -#include #include + +#include "SohInputEditorWindow.h" #include "soh/OTRGlobals.h" #include "soh/SohGui/SohMenu.h" #include "soh/SohGui/SohGui.hpp" -#include "z64.h" #include "soh/cvar_prefixes.h" + +extern "C" { +#include "z64.h" +} + #ifndef __WIIU__ #include #endif diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.h b/soh/soh/Enhancements/controls/SohInputEditorWindow.h index c6fe826037..47037c50df 100644 --- a/soh/soh/Enhancements/controls/SohInputEditorWindow.h +++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.h @@ -8,7 +8,8 @@ #include #include -#include +#include +#include #include typedef CONTROLLERBUTTONS_T N64ButtonMask; diff --git a/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp b/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp index 767f8bf9c6..7df9c4a077 100644 --- a/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp +++ b/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp @@ -1,9 +1,8 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" extern "C" { #include "functions.h" - extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp b/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp index 43f911f46b..c606dbbabf 100644 --- a/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp +++ b/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp @@ -1,9 +1,8 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/resource/type/Skeleton.h" #include "soh/ShipInit.hpp" extern "C" { -#include "variables.h" extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp b/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp index 1b204be28d..19687795d7 100644 --- a/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp +++ b/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp @@ -1,20 +1,24 @@ +#include "ship/utils/color.h" + +#include "soh/Enhancements/randomizer/randomizerTypes.h" +#include "soh/SaveManager.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" +#include "soh/ShipInit.hpp" +#include "soh/frame_interpolation.h" + +extern "C" { #include "z64.h" #include "textures/icon_item_static/icon_item_static.h" #include "textures/icon_item_24_static/icon_item_24_static.h" #include "textures/icon_item_dungeon_static/icon_item_dungeon_static.h" #include "textures/parameter_static/parameter_static.h" #include "soh_assets.h" -#include "soh/Enhancements/randomizer/randomizerTypes.h" -#include "soh/SaveManager.h" -#include "soh/frame_interpolation.h" -#include "ship/utils/color.h" #include "functions.h" #include "macros.h" #include "variables.h" #include "src/overlays/gamestates/ovl_file_choose/file_choose.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" -#include "soh/ShipInit.hpp" #include "assets/textures/title_static/title_static.h" +} /* * TODO: diff --git a/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp b/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp index 1126021e49..e8fffdf788 100644 --- a/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp +++ b/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp @@ -1,15 +1,14 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/randomizer.h" #include "soh/ShipInit.hpp" #include "soh/OTRGlobals.h" #include "soh/ResourceManagerHelpers.h" -#include "objects/object_link_boy/object_link_boy.h" extern "C" { +#include "objects/object_link_boy/object_link_boy.h" #include "functions.h" #include "macros.h" #include "variables.h" - extern PlayState* gPlayState; extern void Player_StartMode_Idle(PlayState*, Player*); extern u8 Randomizer_GetSettingValue(RandomizerSettingKey); diff --git a/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp index 0cb528c0ac..24c52cb48a 100644 --- a/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp +++ b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp @@ -1,6 +1,9 @@ -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" + +extern "C" { #include "z64save.h" +} extern "C" SaveContext gSaveContext; diff --git a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp index 3d0012b6c4..92f38fefa6 100644 --- a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp +++ b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp @@ -1,11 +1,12 @@ #include + #include #include + #include "soh/cvar_prefixes.h" #include "soh/ResourceManagerHelpers.h" extern "C" { -#include #include "objects/gameplay_keep/gameplay_keep.h" #include "objects/object_fz/object_fz.h" #include "objects/object_gi_soldout/object_gi_soldout.h" diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp index 5c959992d2..7ca9a65b7e 100644 --- a/soh/soh/Enhancements/debugconsole.cpp +++ b/soh/soh/Enhancements/debugconsole.cpp @@ -1,10 +1,11 @@ -#include "debugconsole.h" -#include -#include "savestates.h" -#include "soh/ActorDB.h" - #include #include + +#include + +#include "debugconsole.h" +#include "savestates.h" +#include "soh/ActorDB.h" #include "soh/OTRGlobals.h" #include #include "soh/Enhancements/game-interactor/GameInteractor.h" @@ -16,9 +17,7 @@ #define Path _Path #define PATH_HACK -#include -#include #include #undef PATH_HACK #undef Path diff --git a/soh/soh/Enhancements/debugger/MessageViewer.cpp b/soh/soh/Enhancements/debugger/MessageViewer.cpp index 8f5808024d..27241ffd68 100644 --- a/soh/soh/Enhancements/debugger/MessageViewer.cpp +++ b/soh/soh/Enhancements/debugger/MessageViewer.cpp @@ -1,18 +1,16 @@ #include "MessageViewer.h" - #include "soh/SohGui/UIWidgets.hpp" #include "soh/SohGui/SohGui.hpp" #include "soh/SohGui/SohMenu.h" -#include "soh/OTRGlobals.h" - -#include - #include "../custom-message/CustomMessageManager.h" +#include "soh/util.h" + +extern "C" { +#include #include "functions.h" #include "macros.h" #include "message_data_static.h" -#include "variables.h" -#include "soh/util.h" +} extern "C" u8 sMessageHasSetSfx; diff --git a/soh/soh/Enhancements/debugger/actorViewer.cpp b/soh/soh/Enhancements/debugger/actorViewer.cpp index dcc8345ef2..ed3be3fe16 100644 --- a/soh/soh/Enhancements/debugger/actorViewer.cpp +++ b/soh/soh/Enhancements/debugger/actorViewer.cpp @@ -1,3 +1,8 @@ +#include +#include +#include +#include + #include "actorViewer.h" #include "../../util.h" #include "soh/SohGui/UIWidgets.hpp" @@ -6,13 +11,6 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/nametag.h" #include "soh/ShipInit.hpp" - -#include -#include -#include -#include -#include -#include "soh/OTRGlobals.h" #include "soh/cvar_prefixes.h" #include "soh/ObjectExtension/ActorListIndex.h" diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index c44ad0cb41..4e874976d7 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -1,5 +1,12 @@ +#include +#include +#include +#include +#include + +#include + #include "debugSaveEditor.h" -#include "soh/Enhancements/randomizer/randomizerTypes.h" #include "soh/Enhancements/randomizer/randomizer.h" #include "soh/Enhancements/randomizer/static_data.h" #include "soh/Enhancements/randomizer/item.h" @@ -12,28 +19,17 @@ #include "soh/SohGui/UIWidgets.hpp" #include "soh/SohGui/SohGui.hpp" #include "soh/SaveManager.h" -#include "soh/ResourceManagerHelpers.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include extern "C" { +#include #include #include "variables.h" #include "functions.h" #include "macros.h" +#include "message_data_static.h" extern PlayState* gPlayState; } -#include "message_data_static.h" extern "C" MessageTableEntry* sGerMessageEntryTablePtr; extern "C" MessageTableEntry* sFraMessageEntryTablePtr; extern "C" MessageTableEntry* sJpnMessageEntryTablePtr; diff --git a/soh/soh/Enhancements/debugger/dlViewer.cpp b/soh/soh/Enhancements/debugger/dlViewer.cpp index 82107309a9..9a1239abe2 100644 --- a/soh/soh/Enhancements/debugger/dlViewer.cpp +++ b/soh/soh/Enhancements/debugger/dlViewer.cpp @@ -1,14 +1,13 @@ -#include "soh/util.h" -#include "soh/SohGui/UIWidgets.hpp" -#include "soh/SohGui/SohGui.hpp" -#include -#include -#include -#include -#include "soh/OTRGlobals.h" - #include #include + +#include +#include +#include + +#include "soh/SohGui/UIWidgets.hpp" +#include "soh/SohGui/SohGui.hpp" +#include "soh/OTRGlobals.h" #include "dlViewer.h" extern "C" { diff --git a/soh/soh/Enhancements/gameconsole.c b/soh/soh/Enhancements/gameconsole.c index 4cf3002459..f28a351739 100644 --- a/soh/soh/Enhancements/gameconsole.c +++ b/soh/soh/Enhancements/gameconsole.c @@ -1,5 +1,4 @@ #include "gameconsole.h" -#include extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/gameplaystats.cpp b/soh/soh/Enhancements/gameplaystats.cpp index 9602775b1d..2409b53b27 100644 --- a/soh/soh/Enhancements/gameplaystats.cpp +++ b/soh/soh/Enhancements/gameplaystats.cpp @@ -1,19 +1,17 @@ -#include "gameplaystats.h" +#include +#include "gameplaystats.h" #include "soh/SaveManager.h" -#include "functions.h" -#include "macros.h" #include "soh/cvar_prefixes.h" #include "soh/SohGui/UIWidgets.hpp" #include "soh/SohGui/SohGui.hpp" #include "soh/util.h" - -#include -#include #include "soh/Enhancements/BunnyHood.h" #include "soh/OTRGlobals.h" extern "C" { +#include "functions.h" +#include "macros.h" #include #include "variables.h" extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/kaleido.cpp b/soh/soh/Enhancements/kaleido.cpp index 9e78d56790..affeca7f50 100644 --- a/soh/soh/Enhancements/kaleido.cpp +++ b/soh/soh/Enhancements/kaleido.cpp @@ -1,30 +1,26 @@ -#include "kaleido.h" +#include -#include "objects/gameplay_keep/gameplay_keep.h" #include "ship/utils/StringHelper.h" -#include "soh/Enhancements/randomizer/randomizerTypes.h" +#include + +#include "kaleido.h" #include "soh/Enhancements/randomizer/SeedContext.h" #include "soh/ShipInit.hpp" #include "soh/ShipUtils.h" +#include "soh/OTRGlobals.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" +#include "soh/Enhancements/cosmetics/cosmeticsTypes.h" extern "C" { +#include "objects/gameplay_keep/gameplay_keep.h" #include "z64.h" #include "functions.h" #include "macros.h" #include "variables.h" #include -extern PlayState* gPlayState; -} -#include "soh/OTRGlobals.h" -#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh_assets.h" #include "textures/icon_item_static/icon_item_static.h" -#include -#include "soh/Enhancements/cosmetics/cosmeticsTypes.h" - -#include - -extern "C" { +extern PlayState* gPlayState; void KaleidoScope_MoveCursorToSpecialPos(PlayState* play, u16 specialPos); } diff --git a/soh/soh/Enhancements/nametag.h b/soh/soh/Enhancements/nametag.h index afc8b21768..4649c5ba9c 100644 --- a/soh/soh/Enhancements/nametag.h +++ b/soh/soh/Enhancements/nametag.h @@ -1,6 +1,6 @@ #pragma once -#include +#include struct Actor; diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp index 41d58d8427..f7c9b351cc 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp @@ -1,4 +1,3 @@ -#include "../SeedContext.h" #include "../static_data.h" using namespace std::literals::string_literals; diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp index bc5f393e86..68ae12bd54 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp @@ -1,14 +1,12 @@ -#include "item_pool.hpp" +#include +#include "item_pool.hpp" #include "../dungeon.h" -#include "fill.hpp" +#include "soh/Enhancements/randomizer/location_access.h" #include "../static_data.h" #include "../SeedContext.h" #include "../rng.h" #include "soh/Enhancements/randomizer/Traps.h" -#include "soh/Enhancements/randomizer/randomizerTypes.h" -#include -#include std::vector itemPool = {}; std::vector lesserPool = {}; diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp index b8bda99fdd..20c6b75a44 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp @@ -2,7 +2,7 @@ #include #include -#include "../randomizerTypes.h" +#include "soh/Enhancements/randomizer/randomizerEnums.h" class ItemLocation; diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.hpp b/soh/soh/Enhancements/randomizer/3drando/menu.hpp index 767472b1d4..b95de49cca 100644 --- a/soh/soh/Enhancements/randomizer/3drando/menu.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/menu.hpp @@ -2,7 +2,7 @@ #include #include -#include "soh/Enhancements/randomizer/randomizerTypes.h" +#include "soh/Enhancements/randomizer/randomizerEnums.h" #define OPTION_SUB_MENU 1 #define SUB_MENU 2 diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp index 6bc9570394..fbae1e072b 100644 --- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp @@ -1,13 +1,12 @@ -#include "item_pool.hpp" -#include "../location_access.h" +#include +#include + +#include + #include "../rng.h" #include "shops.hpp" #include "../location.h" -#include -#include -#include - PriceSettingsStruct::PriceSettingsStruct(RandomizerSettingKey _main, RandomizerSettingKey _fixedPrice, RandomizerSettingKey _range1, RandomizerSettingKey _range2, RandomizerSettingKey _noWallet, RandomizerSettingKey _childWallet, diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp index f9cb2ab48c..7e8b280cfd 100644 --- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp @@ -1,9 +1,6 @@ #include "starting_inventory.hpp" - #include "../dungeon.h" #include "../SeedContext.h" -#include "../logic.h" -#include "pool_functions.hpp" #include "soh/Enhancements/randomizer/static_data.h" #include "soh/util.h" diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp index 6c63dda954..b09b676165 100644 --- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../randomizerTypes.h" +#include "soh/Enhancements/randomizer/randomizerEnums.h" #include #include diff --git a/soh/soh/Enhancements/randomizer/BigPoes.cpp b/soh/soh/Enhancements/randomizer/BigPoes.cpp index a78fbe830d..b117914dce 100644 --- a/soh/soh/Enhancements/randomizer/BigPoes.cpp +++ b/soh/soh/Enhancements/randomizer/BigPoes.cpp @@ -1,8 +1,10 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/randomizer/randomizer.h" +#include "soh/Enhancements/custom-message/CustomMessageManager.h" +#include "soh/Enhancements/custom-message/CustomMessageTypes.h" +#include "soh/ShipInit.hpp" extern "C" { -#include "variables.h" +#include "functions.h" #include "overlays/actors/ovl_En_Po_Field/z_en_po_field.h" #include "overlays/actors/ovl_En_Gb/z_en_gb.h" extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/randomizer/LakeHyliaWaterControl.cpp b/soh/soh/Enhancements/randomizer/LakeHyliaWaterControl.cpp index 69ffbf134b..6cd88aabeb 100644 --- a/soh/soh/Enhancements/randomizer/LakeHyliaWaterControl.cpp +++ b/soh/soh/Enhancements/randomizer/LakeHyliaWaterControl.cpp @@ -1,17 +1,15 @@ -#include "soh/OTRGlobals.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" -#include "soh/ShipInit.hpp" -#include "soh/Enhancements/custom-message/CustomMessageTypes.h" #include +#include "soh/Enhancements/game-interactor/GameInteractor.h" +#include "soh/ShipInit.hpp" +#include "soh/Enhancements/custom-message/CustomMessageTypes.h" + extern "C" { -extern PlayState* gPlayState; #include "macros.h" #include "functions.h" -#include "variables.h" #include "src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h" #include "textures/map_grand_static/map_grand_static.h" - +extern PlayState* gPlayState; extern void BgSpot06Objects_LockFloat(BgSpot06Objects*, PlayState*); extern void BgSpot06Objects_WaterControl_Lower(BgSpot06Objects*, PlayState*); extern void BgSpot06Objects_WaterControl_Raise(BgSpot06Objects*, PlayState*); diff --git a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp index fdc3e1659d..3c238d105e 100644 --- a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp +++ b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp @@ -1,11 +1,10 @@ -#include "soh/OTRGlobals.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/SeedContext.h" #include "soh/ShipInit.hpp" extern "C" { -extern PlayState* gPlayState; #include "src/overlays/actors/ovl_En_Door/z_en_door.h" +extern PlayState* gPlayState; } using SceneDoorParamsPair = std::pair; diff --git a/soh/soh/Enhancements/randomizer/Messages/EntranceHints.cpp b/soh/soh/Enhancements/randomizer/Messages/EntranceHints.cpp index f67a020b61..b2854426ef 100644 --- a/soh/soh/Enhancements/randomizer/Messages/EntranceHints.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/EntranceHints.cpp @@ -1,7 +1,7 @@ #include "soh/Enhancements/randomizer/entrance.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/randomizer_entrance_tracker.h" -#include "soh/Enhancements/randomizer/randomizer.h" +#include "soh/Enhancements/custom-message/CustomMessageTypes.h" extern "C" { #include diff --git a/soh/soh/Enhancements/randomizer/Messages/Goron.cpp b/soh/soh/Enhancements/randomizer/Messages/Goron.cpp index 3e0b2c79eb..d3e8cb3666 100644 --- a/soh/soh/Enhancements/randomizer/Messages/Goron.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/Goron.cpp @@ -2,8 +2,12 @@ * Handles the randomized silly messages that the Fire Temple * trapped Gorons have when you free them. */ + #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/randomizer/randomizer.h" +#include "soh/Enhancements/custom-message/CustomMessageManager.h" +#include "soh/Enhancements/custom-message/CustomMessageTypes.h" +#include "soh/ShipInit.hpp" +#include "soh/ShipUtils.h" extern "C" { #include diff --git a/soh/soh/Enhancements/randomizer/Messages/GossipStoneHints.cpp b/soh/soh/Enhancements/randomizer/Messages/GossipStoneHints.cpp index 951637cd90..4b4069119d 100644 --- a/soh/soh/Enhancements/randomizer/Messages/GossipStoneHints.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/GossipStoneHints.cpp @@ -2,15 +2,17 @@ * This file handles the custom messages for Gossip Stone * hints. */ + #include -#include "soh/Enhancements/randomizer/randomizer.h" +#include "soh/Enhancements/custom-message/CustomMessageTypes.h" +#include "soh/Enhancements/randomizer/SeedContext.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" extern "C" { -extern PlayState* gPlayState; #include #include #include +extern PlayState* gPlayState; } // Resolves a hint's message for textbox display, firing OnRandoHintRevealed so diff --git a/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp b/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp index 0f48d7740e..b061642923 100644 --- a/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp @@ -4,9 +4,12 @@ * Vanilla/MQ hints when collecting Maps, Ice Trap messages, * etc. */ + +#include +#include + #include #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/Enhancements/custom-message/CustomMessageTypes.h" #include "soh/Enhancements/randomizer/Traps.h" #include "soh/Enhancements/randomizer/item.h" @@ -14,9 +17,6 @@ #include "soh/ShipInit.hpp" #include -#include -#include - extern "C" { #include "variables.h" #include "macros.h" diff --git a/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp b/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp index 017c24571e..abefcd6021 100644 --- a/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp @@ -6,17 +6,17 @@ * including both shops and one-off merchants (i.e. Medigoron, Bean Guy, * and Carpet Salesman) */ + #include #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ObjectExtension/ObjectExtension.h" #include "soh/Enhancements/randomizer/randomizer.h" extern "C" { -extern PlayState* gPlayState; #include #include -#include #include +extern PlayState* gPlayState; } #define RAND_GET_ITEM(rc) OTRGlobals::Instance->gRandoContext->GetItemLocation(rc) diff --git a/soh/soh/Enhancements/randomizer/Messages/Navi.cpp b/soh/soh/Enhancements/randomizer/Messages/Navi.cpp index 0d82ce5add..71ed6e2e5d 100644 --- a/soh/soh/Enhancements/randomizer/Messages/Navi.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/Navi.cpp @@ -2,8 +2,12 @@ * This file is responsible for the messages * for the Rando-Relevant Navi Hints enhancement. */ + #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/randomizer/randomizer.h" +#include "soh/Enhancements/custom-message/CustomMessageManager.h" +#include "soh/Enhancements/custom-message/CustomMessageTypes.h" +#include "soh/ShipInit.hpp" +#include "soh/ShipUtils.h" extern "C" { #include diff --git a/soh/soh/Enhancements/randomizer/Messages/Rupees.cpp b/soh/soh/Enhancements/randomizer/Messages/Rupees.cpp index c2d7c465fd..5bf0817e0f 100644 --- a/soh/soh/Enhancements/randomizer/Messages/Rupees.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/Rupees.cpp @@ -1,8 +1,12 @@ /** * This file is for handling the Randomize Rupee Names enhancement */ + #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/randomizer/randomizer.h" +#include "soh/Enhancements/custom-message/CustomMessageManager.h" +#include "soh/Enhancements/custom-message/CustomMessageTypes.h" +#include "soh/ShipInit.hpp" +#include "soh/ShipUtils.h" extern "C" { #include "variables.h" diff --git a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp index 169c16882d..362b948524 100644 --- a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp @@ -5,17 +5,18 @@ * File for registering hooks for "Static" hints, i.e. hints that * are always given by a specific NPC and/or for a specific item. */ -#include "soh/Enhancements/randomizer/randomizerTypes.h" -#include "z64scene.h" + +#include "soh/Enhancements/custom-message/CustomMessageTypes.h" +#include "soh/Enhancements/randomizer/SeedContext.h" #include -#include "soh/Enhancements/randomizer/randomizer.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" extern "C" { -extern PlayState* gPlayState; +#include "z64scene.h" #include #include #include +extern PlayState* gPlayState; } #define RAND_GET_HINT(rh) OTRGlobals::Instance->gRandoContext->GetHint(rh) diff --git a/soh/soh/Enhancements/randomizer/Plandomizer.cpp b/soh/soh/Enhancements/randomizer/Plandomizer.cpp index 75b7b134bc..d2ff594459 100644 --- a/soh/soh/Enhancements/randomizer/Plandomizer.cpp +++ b/soh/soh/Enhancements/randomizer/Plandomizer.cpp @@ -1,25 +1,22 @@ -#include "Plandomizer.h" -#include -#include "soh/SohGui/UIWidgets.hpp" -#include "soh/util.h" #include -#include "soh/Notification/Notification.h" -#include -#include "soh/Enhancements/randomizer/3drando/hints.hpp" - #include #include +#include + +#include "Plandomizer.h" +#include +#include "soh/SohGui/UIWidgets.hpp" +#include "soh/Notification/Notification.h" +#include "soh/Enhancements/randomizer/3drando/hints.hpp" #include "soh/OTRGlobals.h" #include "soh/SohGui/ImGuiUtils.h" #include "soh/Enhancements/randomizer/logic.h" #include "soh/Enhancements/randomizer/rando_hash.h" #include "soh/Enhancements/randomizer/Traps.h" -#include "soh/Enhancements/randomizer/3drando/shops.hpp" - -#include extern "C" { +#include #include "include/z64item.h" #include "objects/gameplay_keep/gameplay_keep.h" #include "textures/icon_item_static/icon_item_static.h" diff --git a/soh/soh/Enhancements/randomizer/RCToRandInf.h b/soh/soh/Enhancements/randomizer/RCToRandInf.h index bba37b1790..c43d9839a1 100644 --- a/soh/soh/Enhancements/randomizer/RCToRandInf.h +++ b/soh/soh/Enhancements/randomizer/RCToRandInf.h @@ -1,7 +1,7 @@ #pragma once #include -#include "randomizerTypes.h" +#include "soh/Enhancements/randomizer/randomizerEnums.h" // There has been some talk about potentially just using the RC identifier to store flags rather than randomizer inf, so // for now we're not going to store randomzierInf in the randomizer check objects, we're just going to map them 1:1 here diff --git a/soh/soh/Enhancements/randomizer/RocsFeather.cpp b/soh/soh/Enhancements/randomizer/RocsFeather.cpp index 3e8f531b20..176960caaf 100644 --- a/soh/soh/Enhancements/randomizer/RocsFeather.cpp +++ b/soh/soh/Enhancements/randomizer/RocsFeather.cpp @@ -1,10 +1,8 @@ -#include -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" -#include "soh/Enhancements/randomizer/SeedContext.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/ShipInit.hpp" -#include extern "C" { +#include #include #include "functions.h" #include "variables.h" diff --git a/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp index bdad9eb69d..e3738e2126 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp @@ -1,16 +1,13 @@ #include #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh_assets.h" #include "static_data.h" -#include -#include "global.h" #include "soh/ObjectExtension/ObjectExtension.h" #include "item_category_adj.h" #include "soh/Enhancements/randomizer/randomizer.h" #include "soh/Enhancements/randomizer/RCToRandInf.h" extern "C" { -#include "variables.h" +#include "soh_assets.h" #include "overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h" #include "overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h" extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp b/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp index 353d63a9e8..f972d3b1b8 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp @@ -2,7 +2,6 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "item_category_adj.h" #include "particle_cmc.h" -#include "soh/frame_interpolation.h" #include "soh/OTRGlobals.h" #include "soh/Enhancements/randomizer/randomizer.h" #include "soh/Enhancements/randomizer/RCToRandInf.h" diff --git a/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp b/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp index 7cad165192..a227919322 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp @@ -10,7 +10,6 @@ #include "soh/Enhancements/randomizer/RCToRandInf.h" extern "C" { -#include "variables.h" #include "macros.h" #include "functions.h" #include "overlays/actors/ovl_En_Ishi/z_en_ishi.h" diff --git a/soh/soh/Enhancements/randomizer/ShuffleSilver.h b/soh/soh/Enhancements/randomizer/ShuffleSilver.h index 278728570c..807fa4d463 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleSilver.h +++ b/soh/soh/Enhancements/randomizer/ShuffleSilver.h @@ -3,7 +3,7 @@ #include #include "randomizerEnums.h" #include -#include +#include bool IsSilverInPool(RandomizerGet rg); RandomizerGet SilverFromSwitchFlag(s16 switchFlag); diff --git a/soh/soh/Enhancements/randomizer/ShuffleTreasureChestGame.cpp b/soh/soh/Enhancements/randomizer/ShuffleTreasureChestGame.cpp index cb9fd22d77..7e89ef88b7 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleTreasureChestGame.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleTreasureChestGame.cpp @@ -1,5 +1,5 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/randomizer/randomizer.h" +#include "soh/Enhancements/randomizer/SeedContext.h" extern "C" { #include "src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h" diff --git a/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp b/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp index 2a8565edfb..c26e79d1e6 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp @@ -1,6 +1,5 @@ #include #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh_assets.h" #include "static_data.h" #include "soh/ObjectExtension/ObjectExtension.h" #include "item_category_adj.h" @@ -8,7 +7,7 @@ #include "soh/Enhancements/randomizer/RCToRandInf.h" extern "C" { -#include "variables.h" +#include "soh_assets.h" #include "src/overlays/actors/ovl_En_Wood02/z_en_wood02.h" #include "objects/object_wood02/object_wood02.h" extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/randomizer/bean_patches.h b/soh/soh/Enhancements/randomizer/bean_patches.h index ee15b2523c..d6092ea734 100644 --- a/soh/soh/Enhancements/randomizer/bean_patches.h +++ b/soh/soh/Enhancements/randomizer/bean_patches.h @@ -2,7 +2,7 @@ #include -#include "randomizerTypes.h" +#include "soh/Enhancements/randomizer/randomizerEnums.h" #include "z64scene.h" // One row per bean patch, shared by logic, savefile setup and the actor hooks. diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp index 6bf87e7375..b65aab0c57 100644 --- a/soh/soh/Enhancements/randomizer/draw.cpp +++ b/soh/soh/Enhancements/randomizer/draw.cpp @@ -1,20 +1,17 @@ #include "draw.h" #include "soh/OTRGlobals.h" -#include "soh_assets.h" -#include "soh/ResourceManagerHelpers.h" #include "soh/Enhancements/cosmetics/cosmeticsTypes.h" #include "soh/Enhancements/randomizer/randomizer.h" #include "dungeon.h" #include "logic.h" extern "C" { +#include "soh_assets.h" #include "z64.h" #include "macros.h" #include "functions.h" #include "variables.h" #include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_gi_key/object_gi_key.h" -#include "objects/object_gi_bosskey/object_gi_bosskey.h" #include "objects/object_gi_compass/object_gi_compass.h" #include "objects/object_gi_map/object_gi_map.h" #include "objects/object_gi_hearts/object_gi_hearts.h" @@ -22,7 +19,6 @@ extern "C" { #include "objects/object_gi_scale/object_gi_scale.h" #include "objects/object_gi_fire/object_gi_fire.h" #include "objects/object_toki_objects/object_toki_objects.h" -#include "objects/object_gi_bomb_2/object_gi_bomb_2.h" #include "objects/object_goma/object_goma.h" #include "objects/object_kingdodongo/object_kingdodongo.h" #include "objects/object_bv/object_bv.h" diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp index d122a9bbc1..204a8062f5 100644 --- a/soh/soh/Enhancements/randomizer/fishsanity.cpp +++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp @@ -1,20 +1,20 @@ +#include + #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "../../OTRGlobals.h" #include "fishsanity.h" #include "draw.h" -#include "soh/frame_interpolation.h" -#include "variables.h" -#include "functions.h" -#include "macros.h" -#include #include "soh/Enhancements/randomizer/randomizer.h" #include "soh/Enhancements/randomizer/randomizerTypes.h" #include "soh/Enhancements/randomizer/RCToRandInf.h" +#include "soh/frame_interpolation.h" extern "C" { +#include "variables.h" +#include "functions.h" +#include "macros.h" #include "src/overlays/actors/ovl_Fishing/z_fishing.h" #include "src/overlays/actors/ovl_En_Fish/z_en_fish.h" - extern SaveContext gSaveContext; extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/randomizer/fishsanity.h b/soh/soh/Enhancements/randomizer/fishsanity.h index 2a79453527..8a9dd70e47 100644 --- a/soh/soh/Enhancements/randomizer/fishsanity.h +++ b/soh/soh/Enhancements/randomizer/fishsanity.h @@ -1,6 +1,5 @@ #pragma once -#include "soh/Enhancements/randomizer/randomizerTypes.h" #include "soh/Enhancements/randomizer/location.h" typedef enum { diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp index 4b8383b765..9c9e4b141b 100644 --- a/soh/soh/Enhancements/randomizer/hint.cpp +++ b/soh/soh/Enhancements/randomizer/hint.cpp @@ -1,7 +1,6 @@ #include "hint.h" #include "string" #include "SeedContext.h" -#include #include "static_data.h" #include "rng.h" diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index 15a799932e..3afae3e083 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp @@ -8,7 +8,6 @@ #include "soh/Enhancements/randomizer/fishsanity.h" #include "soh/Enhancements/randomizer/static_data.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/SohGui/ImGuiUtils.h" #include "soh/Notification/Notification.h" #include "soh/SaveManager.h" diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp index a7d8675738..0ac4ead5f6 100644 --- a/soh/soh/Enhancements/randomizer/item.cpp +++ b/soh/soh/Enhancements/randomizer/item.cpp @@ -1,15 +1,13 @@ #include "item.h" -#include "item_location.h" - #include "SeedContext.h" #include "logic.h" -#include "3drando/item_pool.hpp" -#include "z64item.h" -#include "variables.h" -#include "functions.h" #include "../../OTRGlobals.h" #include "soh/Enhancements/randomizer/randomizer.h" +extern "C" { +#include "z64item.h" +} + namespace Rando { Item::Item() : randomizerGet(RG_NONE), type(ITEMTYPE_ITEM), getItemId(GI_NONE), advancement(false), hintKey(RHT_NONE), price(0) { diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h index 8b61c93833..3b036de809 100644 --- a/soh/soh/Enhancements/randomizer/item.h +++ b/soh/soh/Enhancements/randomizer/item.h @@ -4,7 +4,6 @@ #include #include "soh/Enhancements/custom-message/text.h" -#include "randomizerTypes.h" #include "soh/Enhancements/item-tables/ItemTableTypes.h" #include "3drando/hints.hpp" diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp index a5efdd7436..1bfe380d01 100644 --- a/soh/soh/Enhancements/randomizer/item_location.cpp +++ b/soh/soh/Enhancements/randomizer/item_location.cpp @@ -1,11 +1,10 @@ +#include + #include "item_location.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "SeedContext.h" -#include "logic.h" #include "rng.h" -#include - namespace Rando { ItemLocation::ItemLocation() : rc(RC_UNKNOWN_CHECK) { } diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp index b941dd5270..55ad3ce09d 100644 --- a/soh/soh/Enhancements/randomizer/logic.cpp +++ b/soh/soh/Enhancements/randomizer/logic.cpp @@ -1,19 +1,19 @@ +#include + #include "logic.h" #include "bean_patches.h" #include "../debugger/performanceTimer.h" - -#include - #include "soh/OTRGlobals.h" #include "randomizer.h" #include "dungeon.h" #include "SeedContext.h" +#include "randomizer.h" +#include "location_access.h" + +extern "C" { #include "macros.h" #include "variables.h" -#include "randomizer.h" -#include -#include -#include "location_access.h" +} extern "C" PlayState* gPlayState; diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp index f7817ed252..1c51e7d35f 100644 --- a/soh/soh/Enhancements/randomizer/option.cpp +++ b/soh/soh/Enhancements/randomizer/option.cpp @@ -1,9 +1,7 @@ +#include + #include "option.h" -#include -#include -#include "soh/Enhancements/randomizer/settings.h" #include "soh/SohGui/SohMenu.h" -#include "soh/SohGui/UIWidgets.hpp" #include "soh/Enhancements/Lang/Lang.h" #include diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 133b179904..45041816c3 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1,19 +1,16 @@ -#include "randomizer.h" -#include #include -#include -#include -#include +#include +#include + +#include +#include + +#include "randomizer.h" #include "3drando/menu.hpp" #include "soh/ResourceManagerHelpers.h" #include "soh/SohGui/SohGui.hpp" -#include -#include "../../../src/overlays/actors/ovl_En_GirlA/z_en_girla.h" #include "randomizer_check_objects.h" -#include -#include #include "soh/OTRGlobals.h" -#include #include "static_data.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "settings.h" @@ -25,8 +22,11 @@ #include "logic.h" extern "C" { +#include +#include +#include +#include "../../../src/overlays/actors/ovl_En_GirlA/z_en_girla.h" #include "src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h" - extern void func_80B8FE00(ObjBean*); // trigger planting extern PlayState* gPlayState; } diff --git a/soh/soh/Enhancements/randomizer/randomizerEnumStrings.cpp b/soh/soh/Enhancements/randomizer/randomizerEnumStrings.cpp index 2d9faf3d31..5269d217cd 100644 --- a/soh/soh/Enhancements/randomizer/randomizerEnumStrings.cpp +++ b/soh/soh/Enhancements/randomizer/randomizerEnumStrings.cpp @@ -1,7 +1,5 @@ #include "randomizerEnumStrings.h" -#include "randomizerEnums.h" - // Redefine enum macros to generate string->enum maps for every enum. #define RANDO_ENUM_BEGIN(EnumName) \ template <> const std::unordered_map& GetStringToEnumMap() { \ @@ -17,8 +15,6 @@ return map; \ } -#include "randomizerEnums.h" - #undef RANDO_ENUM_BEGIN #undef RANDO_ENUM_ITEM #undef RANDO_ENUM_END @@ -37,5 +33,3 @@ (); \ return map; \ } - -#include "randomizerEnums.h" \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp index e9dd89aaf4..e3ca0930b0 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp @@ -1,3 +1,12 @@ +#include +#include +#include +#include +#include + +#include +#include + #include "randomizer_check_tracker.h" #include "randomizer_entrance_tracker.h" #include "randomizer_item_tracker.h" @@ -6,10 +15,8 @@ #include "soh/Enhancements/randomizer/static_data.h" #include "soh/OTRGlobals.h" #include "soh/SaveManager.h" -#include "soh/ResourceManagerHelpers.h" #include "soh/SohGui/UIWidgets.hpp" #include "soh/SohGui/SohGui.hpp" -#include "soh/SohGui/SohMenu.h" #include "dungeon.h" #include "entrance.h" #include "fishsanity.h" @@ -18,27 +25,19 @@ #include "soh/Enhancements/debugger/performanceTimer.h" #include "soh/Enhancements/randomizer/randomizer.h" #include "soh/ObjectExtension/ObjectExtension.h" -#include "overlays/actors/ovl_En_GirlA/z_en_girla.h" - -#include -#include -#include -#include -#include -#include -#include #include "location.h" #include "item_location.h" #include "randomizer_check_objects.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "z64item.h" extern "C" { +#include "overlays/actors/ovl_En_GirlA/z_en_girla.h" +#include "z64item.h" #include "variables.h" -#include "functions.h" #include "macros.h" extern PlayState* gPlayState; } + extern "C" GetItemEntry ItemTable_RetrieveEntry(s16 modIndex, s16 getItemID); extern std::vector dungeonRewardStones; diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c index 34302bf72c..604ae7654e 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c @@ -14,7 +14,9 @@ #include "soh/SaveManager.h" #include -#include "global.h" +#include "functions.h" +#include "macros.h" +#include "variables.h" #include "entrance.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.c b/soh/soh/Enhancements/randomizer/randomizer_grotto.c index 55185f5677..f19fe2eaa8 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_grotto.c +++ b/soh/soh/Enhancements/randomizer/randomizer_grotto.c @@ -6,7 +6,7 @@ #include "randomizer_grotto.h" #include "soh/OTRGlobals.h" -#include "global.h" +#include "variables.h" extern PlayState* gPlayState; diff --git a/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.cpp index 0449f7f958..3267771e37 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.cpp @@ -1,8 +1,3 @@ -#include "randomizer_hint_tracker.h" -#include "soh/OTRGlobals.h" -#include "soh/SaveManager.h" -#include "soh/SohGui/SohGui.hpp" - #include #include #include @@ -11,16 +6,14 @@ #include #include #include + #include #include -extern "C" { -#include -#include "macros.h" -#include "variables.h" -extern PlayState* gPlayState; -} - +#include "randomizer_hint_tracker.h" +#include "soh/OTRGlobals.h" +#include "soh/SaveManager.h" +#include "soh/SohGui/SohGui.hpp" #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/hint.h" #include "soh/Enhancements/randomizer/item_category_adj.h" @@ -30,6 +23,12 @@ extern PlayState* gPlayState; #include "soh/Enhancements/randomizer/SeedContext.h" #include "soh/Enhancements/randomizer/static_data.h" +extern "C" { +#include +#include "variables.h" +extern PlayState* gPlayState; +} + using namespace UIWidgets; // Defined in debugSaveEditor.cpp. diff --git a/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.h index a9351ee74d..383f921e4b 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.h +++ b/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.h @@ -1,7 +1,6 @@ #pragma once #include -#include "randomizerTypes.h" typedef enum { // Every hint location grouped by area, with unread hint text masked. diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp index 406940be32..ea0c15ca70 100644 --- a/soh/soh/Enhancements/randomizer/savefile.cpp +++ b/soh/soh/Enhancements/randomizer/savefile.cpp @@ -1,20 +1,17 @@ +#include + #include "savefile.h" #include "soh/OTRGlobals.h" #include "soh/ResourceManagerHelpers.h" -#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/bean_patches.h" #include "soh/Enhancements/randomizer/dungeon.h" #include "soh/Enhancements/randomizer/logic.h" #include "soh/Enhancements/randomizer/randomizer.h" -#include - extern "C" { -#include #include "variables.h" #include "functions.h" #include "macros.h" - uint8_t Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey); GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId); } diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp index 786d3d2813..92a4689efd 100644 --- a/soh/soh/Enhancements/randomizer/settings.cpp +++ b/soh/soh/Enhancements/randomizer/settings.cpp @@ -1,3 +1,8 @@ +#include +#include +#include +#include + #include "settings.h" #include "trial.h" #include "dungeon.h" @@ -5,12 +10,6 @@ #include "soh/Enhancements/randomizer/rng.h" #include "soh/OTRGlobals.h" -#include -#include -#include -#include -#include - namespace Rando { std::shared_ptr Settings::mInstance; diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h index fcd274c58a..b9c1d5797c 100644 --- a/soh/soh/Enhancements/randomizer/settings.h +++ b/soh/soh/Enhancements/randomizer/settings.h @@ -5,7 +5,6 @@ #include #include -#include namespace Rando { class Settings { diff --git a/soh/soh/Enhancements/savestates.cpp b/soh/soh/Enhancements/savestates.cpp index 6ea87c1b8a..d099d3453a 100644 --- a/soh/soh/Enhancements/savestates.cpp +++ b/soh/soh/Enhancements/savestates.cpp @@ -1,19 +1,19 @@ -#include "savestates.h" - #include -#include +#include #include #include -#include + +#include "savestates.h" #include #include +#include "savestate_serialize.h" +extern "C" { #include "z64.h" #include "z64save.h" #include -#include -#include "savestate_serialize.h" +} extern "C" PlayState* gPlayState; extern "C" EffectContext sEffectContext; diff --git a/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp b/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp index f92959ff15..83b048aade 100644 --- a/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp +++ b/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp @@ -1,6 +1,8 @@ -#include "ESpeakSpeechSynthesizer.h" #include -#include + +#include + +#include "ESpeakSpeechSynthesizer.h" ESpeakSpeechSynthesizer::ESpeakSpeechSynthesizer() { } diff --git a/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp b/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp index dd4526dad2..e525dba019 100644 --- a/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp +++ b/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp @@ -1,5 +1,6 @@ +#include + #include "SpeechLogger.h" -#include SpeechLogger::SpeechLogger() { } diff --git a/soh/soh/Enhancements/timesplits/TimeSplits.cpp b/soh/soh/Enhancements/timesplits/TimeSplits.cpp index 689033ec03..f0f78e0de5 100644 --- a/soh/soh/Enhancements/timesplits/TimeSplits.cpp +++ b/soh/soh/Enhancements/timesplits/TimeSplits.cpp @@ -1,19 +1,17 @@ #include #include -#include #include +#include + #include "TimeSplits.h" #include "soh/Enhancements/gameplaystats.h" - #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "soh_assets.h" #include #include "soh/SohGui/UIWidgets.hpp" -#include - extern "C" { +#include "soh_assets.h" #include "z64item.h" #include "macros.h" extern SaveContext gSaveContext; diff --git a/soh/soh/Network/Anchor/Anchor.cpp b/soh/soh/Network/Anchor/Anchor.cpp index f3883e2b9c..76a6e98f04 100644 --- a/soh/soh/Network/Anchor/Anchor.cpp +++ b/soh/soh/Network/Anchor/Anchor.cpp @@ -1,11 +1,11 @@ -#include "Anchor.h" #include -#include "soh/OTRGlobals.h" + +#include "Anchor.h" #include "soh/Enhancements/nametag.h" #include "soh/ObjectExtension/ObjectExtension.h" -#include "soh/Enhancements/randomizer/randomizer.h" extern "C" { +#include "macros.h" #include "variables.h" #include "functions.h" extern PlayState* gPlayState; diff --git a/soh/soh/Network/Anchor/AnchorRoomWindow.cpp b/soh/soh/Network/Anchor/AnchorRoomWindow.cpp index ec6ff51493..2d68a62974 100644 --- a/soh/soh/Network/Anchor/AnchorRoomWindow.cpp +++ b/soh/soh/Network/Anchor/AnchorRoomWindow.cpp @@ -1,12 +1,11 @@ -#include "Anchor.h" #include + +#include "Anchor.h" #include "soh/OTRGlobals.h" #include "soh/util.h" #include "soh/Enhancements/randomizer/SeedContext.h" extern "C" { -#include "variables.h" -#include "functions.h" extern PlayState* gPlayState; } diff --git a/soh/soh/Network/Anchor/HookHandlers.cpp b/soh/soh/Network/Anchor/HookHandlers.cpp index eec6e4461e..a2084e8163 100644 --- a/soh/soh/Network/Anchor/HookHandlers.cpp +++ b/soh/soh/Network/Anchor/HookHandlers.cpp @@ -2,7 +2,6 @@ #include "soh/Enhancements/cosmetics/cosmeticsTypes.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/frame_interpolation.h" -#include "soh/OTRGlobals.h" extern "C" { #include "variables.h" @@ -31,10 +30,8 @@ extern "C" { #include "src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h" #include "src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h" #include "objects/gameplay_keep/gameplay_keep.h" - extern PlayState* gPlayState; extern MapData* gMapData; - void func_8086ED70(BgBombwall* bgBombwall, PlayState* play); void BgBreakwall_Wait(BgBreakwall* bgBreakwall, PlayState* play); void BgHakaZou_WaitForHit(BgHakaZou* bgHakaZou, PlayState* play); diff --git a/soh/soh/Network/Anchor/Packets/DamagePlayer.cpp b/soh/soh/Network/Anchor/Packets/DamagePlayer.cpp index 6238a7f781..b6a8771200 100644 --- a/soh/soh/Network/Anchor/Packets/DamagePlayer.cpp +++ b/soh/soh/Network/Anchor/Packets/DamagePlayer.cpp @@ -1,6 +1,6 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" extern "C" { #include "macros.h" diff --git a/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp b/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp index bf9b57237e..7cbe5b371f 100644 --- a/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp +++ b/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp @@ -1,5 +1,4 @@ #include "soh/Network/Anchor/Anchor.h" -#include /** * DISABLE_ANCHOR diff --git a/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp b/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp index ce6efad131..70d827e349 100644 --- a/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp +++ b/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp @@ -1,6 +1,6 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" #include "soh/Enhancements/randomizer/randomizer_entrance.h" /** diff --git a/soh/soh/Network/Anchor/Packets/GameComplete.cpp b/soh/soh/Network/Anchor/Packets/GameComplete.cpp index 0b01e3b64c..da5ae111dc 100644 --- a/soh/soh/Network/Anchor/Packets/GameComplete.cpp +++ b/soh/soh/Network/Anchor/Packets/GameComplete.cpp @@ -1,6 +1,6 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" #include "soh/Notification/Notification.h" #include "soh/ShipUtils.h" diff --git a/soh/soh/Network/Anchor/Packets/GiveItem.cpp b/soh/soh/Network/Anchor/Packets/GiveItem.cpp index 4ab439894d..1695c1e6c3 100644 --- a/soh/soh/Network/Anchor/Packets/GiveItem.cpp +++ b/soh/soh/Network/Anchor/Packets/GiveItem.cpp @@ -1,11 +1,10 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" +#include "soh/Enhancements/randomizer/static_data.h" #include "soh/Notification/Notification.h" -#include "soh/Enhancements/randomizer/randomizer.h" #include "soh/SohGui/ImGuiUtils.h" #include "soh/Enhancements/item-tables/ItemTableManager.h" -#include "soh/OTRGlobals.h" extern "C" { #include "functions.h" diff --git a/soh/soh/Network/Anchor/Packets/Handshake.cpp b/soh/soh/Network/Anchor/Packets/Handshake.cpp index bfbb94f8ec..ee88a2fde1 100644 --- a/soh/soh/Network/Anchor/Packets/Handshake.cpp +++ b/soh/soh/Network/Anchor/Packets/Handshake.cpp @@ -1,6 +1,6 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" /** * HANDSHAKE diff --git a/soh/soh/Network/Anchor/Packets/RequestTeleport.cpp b/soh/soh/Network/Anchor/Packets/RequestTeleport.cpp index 17b1d27938..cac233cf79 100644 --- a/soh/soh/Network/Anchor/Packets/RequestTeleport.cpp +++ b/soh/soh/Network/Anchor/Packets/RequestTeleport.cpp @@ -1,6 +1,6 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" /** * REQUEST_TELEPORT diff --git a/soh/soh/Network/Anchor/Packets/SetCheckStatus.cpp b/soh/soh/Network/Anchor/Packets/SetCheckStatus.cpp index 31d107e0aa..7bd3d82862 100644 --- a/soh/soh/Network/Anchor/Packets/SetCheckStatus.cpp +++ b/soh/soh/Network/Anchor/Packets/SetCheckStatus.cpp @@ -1,6 +1,6 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" #include "soh/OTRGlobals.h" #include "soh/Enhancements/randomizer/randomizer_check_tracker.h" #include "soh/Enhancements/randomizer/randomizer.h" diff --git a/soh/soh/Network/Anchor/Packets/SetFlag.cpp b/soh/soh/Network/Anchor/Packets/SetFlag.cpp index 65c739dfe1..f77a7f40db 100644 --- a/soh/soh/Network/Anchor/Packets/SetFlag.cpp +++ b/soh/soh/Network/Anchor/Packets/SetFlag.cpp @@ -1,10 +1,10 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" +#include "soh/Enhancements/game-interactor/GameInteractionEffect.h" extern "C" { #include "functions.h" - extern PlayState* gPlayState; } diff --git a/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp b/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp index cf97fb732e..57cf9e309a 100644 --- a/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp +++ b/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp @@ -1,6 +1,7 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" +#include "soh/Enhancements/game-interactor/GameInteractionEffect.h" extern "C" { #include "functions.h" diff --git a/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp b/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp index 4f50759ee2..98a5ea99de 100644 --- a/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp +++ b/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp @@ -1,6 +1,6 @@ -#include "soh/Network/Anchor/Anchor.h" #include -#include "soh/Enhancements/game-interactor/GameInteractor.h" + +#include "soh/Network/Anchor/Anchor.h" extern "C" { #include "macros.h" diff --git a/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp b/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp index 7a1ae9d3fc..a49aacad19 100644 --- a/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp +++ b/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp @@ -1,7 +1,6 @@ -#include "soh/Network/Anchor/Anchor.h" -#include "soh/Network/Anchor/JsonConversions.hpp" #include -#include "soh/OTRGlobals.h" + +#include "soh/Network/Anchor/Anchor.h" extern "C" { extern PlayState* gPlayState; diff --git a/soh/soh/Network/CrowdControl/CrowdControl.cpp b/soh/soh/Network/CrowdControl/CrowdControl.cpp index 94ce46ec15..d4450876ea 100644 --- a/soh/soh/Network/CrowdControl/CrowdControl.cpp +++ b/soh/soh/Network/CrowdControl/CrowdControl.cpp @@ -1,12 +1,12 @@ -#include "CrowdControl.h" -#include "CrowdControlTypes.h" #include #include + +#include "CrowdControl.h" +#include "CrowdControlTypes.h" #include "soh/ShipInit.hpp" extern "C" { #include -#include "functions.h" extern PlayState* gPlayState; } diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 6b09fe87ab..ef7f5d49ec 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include "Enhancements/gameconsole.h" #ifdef _WIN32 @@ -27,7 +26,6 @@ #else #include #endif -#include #include #include #include "Enhancements/speechsynthesizer/SpeechSynthesizer.h" @@ -91,9 +89,7 @@ #include // Resource Types/Factories -#include #include "soh/resource/type/SohResourceType.h" -#include "soh/resource/type/Animation.h" #include "soh/resource/type/Skeleton.h" #include #include diff --git a/soh/soh/ResourceManagerHelpers.cpp b/soh/soh/ResourceManagerHelpers.cpp index 032b396a97..69a482f6bd 100644 --- a/soh/soh/ResourceManagerHelpers.cpp +++ b/soh/soh/ResourceManagerHelpers.cpp @@ -1,9 +1,14 @@ -#include "ResourceManagerHelpers.h" #include +#include +#include +#include +#include +#include +#include +#include + +#include "ResourceManagerHelpers.h" #include "OTRGlobals.h" -#include "variables.h" -#include "z64.h" -#include "macros.h" #include "cvar_prefixes.h" #include "Enhancements/enhancementTypes.h" #include "Enhancements/randomizer/dungeon.h" @@ -13,15 +18,12 @@ #include "resource/type/Array.h" #include "resource/type/Skeleton.h" #include "resource/type/PlayerAnimation.h" -#include -#include -#include -#include -#include -#include -#include -#include +extern "C" { +#include "variables.h" +#include "z64.h" +#include "macros.h" +} extern "C" PlayState* gPlayState; diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index af0f746645..2278615306 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -7,15 +7,16 @@ #include "Enhancements/randomizer/trial.h" #include "soh/util.h" #include "Enhancements/randomizer/hint.h" -#include "Enhancements/randomizer/item.h" #include "soh/Enhancements/randomizer/settings.h" #include "ResourceManagerHelpers.h" +#include "soh/SohGui/SohGui.hpp" +extern "C" { #include "z64.h" #include "functions.h" #include "macros.h" #include -#include "soh/SohGui/SohGui.hpp" +} #define NOGDI // avoid various windows defines that conflict with things in z64.h #include diff --git a/soh/soh/SohGui/ImGuiUtils.cpp b/soh/soh/SohGui/ImGuiUtils.cpp index 5452e3d290..c978540eca 100644 --- a/soh/soh/SohGui/ImGuiUtils.cpp +++ b/soh/soh/SohGui/ImGuiUtils.cpp @@ -1,13 +1,12 @@ -#include "ImGuiUtils.h" #include -#include -#include "assets/soh_assets.h" +#include + +#include "ImGuiUtils.h" #include "soh/Enhancements/randomizer/rando_hash.h" #include "soh/Enhancements/randomizer/randomizerTypes.h" -#include - extern "C" { +#include "assets/soh_assets.h" #include "textures/icon_item_static/icon_item_static.h" #include "textures/parameter_static/parameter_static.h" } diff --git a/soh/soh/SohGui/Menu.cpp b/soh/soh/SohGui/Menu.cpp index 264952db36..4d8c609089 100644 --- a/soh/soh/SohGui/Menu.cpp +++ b/soh/soh/SohGui/Menu.cpp @@ -1,18 +1,20 @@ +#include +#include + +#include +#include + #include "Menu.h" #include "BackendTypes.h" #include "UIWidgets.hpp" #include "soh/OTRGlobals.h" -#include -#include #include "SohModals.h" -#include -#include -#include extern "C" { #include "z64.h" extern PlayState* gPlayState; } + std::vector windowTypeSizes = { {} }; extern std::unordered_map warpPointSceneList; diff --git a/soh/soh/SohGui/ResolutionEditor.cpp b/soh/soh/SohGui/ResolutionEditor.cpp index b9e0f798e6..d61c74ce8a 100644 --- a/soh/soh/SohGui/ResolutionEditor.cpp +++ b/soh/soh/SohGui/ResolutionEditor.cpp @@ -1,10 +1,9 @@ -#include "ResolutionEditor.h" #include -#include - -#include "soh/SohGui/UIWidgets.hpp" #include #include + +#include "ResolutionEditor.h" +#include "soh/SohGui/UIWidgets.hpp" #include "soh/OTRGlobals.h" #include "soh/SohGui/SohMenu.h" #include "soh/SohGui/SohGui.hpp" diff --git a/soh/soh/SohGui/SohGui.cpp b/soh/soh/SohGui/SohGui.cpp index c00083e0be..3e4aa5d7f8 100644 --- a/soh/soh/SohGui/SohGui.cpp +++ b/soh/soh/SohGui/SohGui.cpp @@ -5,10 +5,10 @@ // Created by David Chavez on 24.08.22. // -#include "SohGui.hpp" - #include +#include "SohGui.hpp" + #ifdef __APPLE__ #include #endif @@ -16,7 +16,6 @@ #ifdef __SWITCH__ #include #endif -#include "include/global.h" #include "soh/Enhancements/debugger/MessageViewer.h" #include "soh/Notification/Notification.h" diff --git a/soh/soh/SohGui/SohMenu.cpp b/soh/soh/SohGui/SohMenu.cpp index ee44714ebd..ae098993e3 100644 --- a/soh/soh/SohGui/SohMenu.cpp +++ b/soh/soh/SohGui/SohMenu.cpp @@ -1,7 +1,7 @@ -#include "SohMenu.h" #include #include -#include + +#include "SohMenu.h" extern "C" { extern PlayState* gPlayState; diff --git a/soh/soh/SohGui/SohMenuDevTools.cpp b/soh/soh/SohGui/SohMenuDevTools.cpp index fdb505c880..de178da7b4 100644 --- a/soh/soh/SohGui/SohMenuDevTools.cpp +++ b/soh/soh/SohGui/SohMenuDevTools.cpp @@ -1,5 +1,7 @@ +#include +#include + #include "SohMenu.h" -#include "SohGui.hpp" extern "C" { extern PlayState* gPlayState; diff --git a/soh/soh/SohGui/SohMenuNetwork.cpp b/soh/soh/SohGui/SohMenuNetwork.cpp index c0f41fdff9..5ee770d3eb 100644 --- a/soh/soh/SohGui/SohMenuNetwork.cpp +++ b/soh/soh/SohGui/SohMenuNetwork.cpp @@ -1,6 +1,5 @@ #include "SohMenu.h" #include -#include #include "SohGui.hpp" #include "soh/OTRGlobals.h" #include "soh/util.h" diff --git a/soh/soh/SohGui/SohMenuRandomizer.cpp b/soh/soh/SohGui/SohMenuRandomizer.cpp index eea57332be..86d69d4ab6 100644 --- a/soh/soh/SohGui/SohMenuRandomizer.cpp +++ b/soh/soh/SohGui/SohMenuRandomizer.cpp @@ -1,10 +1,10 @@ #include + #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "SohMenu.h" #include "soh/Enhancements/enhancementTypes.h" #include "soh/Enhancements/randomizer/randomizer_check_objects.h" #include "soh/Enhancements/randomizer/randomizer.h" -#include "soh/Enhancements/randomizer/randomizerTypes.h" #include "soh/Enhancements/randomizer/settings.h" #include "soh/ShipUtils.h" #include "soh/SohGui/SohGui.hpp" diff --git a/soh/soh/SohGui/SohMenuStartingItems.cpp b/soh/soh/SohGui/SohMenuStartingItems.cpp index caa60ed094..e97d802b8b 100644 --- a/soh/soh/SohGui/SohMenuStartingItems.cpp +++ b/soh/soh/SohGui/SohMenuStartingItems.cpp @@ -1,18 +1,14 @@ +#include + +#include + #include "soh/SohGui/SohGui.hpp" #include "soh/SohGui/UIWidgets.hpp" #include "soh/SohGui/ImGuiUtils.h" #include "soh/OTRGlobals.h" #include "soh/cvar_prefixes.h" -#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/settings.h" -#include -#include - -extern "C" { -#include "z64.h" -} - namespace SohGui { using namespace UIWidgets; diff --git a/soh/soh/SohGui/UIWidgets.cpp b/soh/soh/SohGui/UIWidgets.cpp index b2cc7be92f..9e6d80bfa2 100644 --- a/soh/soh/SohGui/UIWidgets.cpp +++ b/soh/soh/SohGui/UIWidgets.cpp @@ -1,10 +1,10 @@ #include "UIWidgets.hpp" + #define IMGUI_DEFINE_MATH_OPERATORS #include #include #include #include -#include #include "soh/OTRGlobals.h" namespace UIWidgets { diff --git a/soh/soh/framebuffer_effects.c b/soh/soh/framebuffer_effects.c index 15324938c0..ffa82da310 100644 --- a/soh/soh/framebuffer_effects.c +++ b/soh/soh/framebuffer_effects.c @@ -1,5 +1,5 @@ #include "framebuffer_effects.h" -#include "global.h" +#include "variables.h" #include "OTRGlobals.h" int gfx_create_framebuffer(uint32_t width, uint32_t height, uint32_t native_width, uint32_t native_height, diff --git a/soh/soh/framebuffer_effects.h b/soh/soh/framebuffer_effects.h index 60ffbf428a..8f69f5d7ad 100644 --- a/soh/soh/framebuffer_effects.h +++ b/soh/soh/framebuffer_effects.h @@ -1,6 +1,6 @@ #pragma once -#include +#include extern s32 gPauseFrameBuffer; extern s32 gBlurFrameBuffer; diff --git a/soh/soh/gu_pc.c b/soh/soh/gu_pc.c index 48daaad16f..245ac435c3 100644 --- a/soh/soh/gu_pc.c +++ b/soh/soh/gu_pc.c @@ -1,5 +1,6 @@ #include -#include "z64.h" + +#include void guMtxF2L(float mf[4][4], Mtx* m) { unsigned int r, c; diff --git a/soh/soh/mixer.c b/soh/soh/mixer.c index df62001399..6f5ca02327 100644 --- a/soh/soh/mixer.c +++ b/soh/soh/mixer.c @@ -1,9 +1,11 @@ //! This file is always optimized by a rule in the CMakeList. This is done because the SIMD functions are very large //! when unoptimized and clang does not allow optimizing a single function. + #include #include #include "mixer.h" + #ifndef __clang__ #ifndef _MSC_VER #pragma GCC optimize("unroll-loops") @@ -104,7 +106,6 @@ void aLoadBufferImpl(const void* source_addr, uint16_t dest_addr, uint16_t nbyte #endif } -#include #include void aOPUSdecImpl(void* source_addr, uint16_t dest_addr, uint16_t nbytes, struct OggOpusFile** decState, int32_t pos, diff --git a/soh/soh/resource/importer/ArrayFactory.cpp b/soh/soh/resource/importer/ArrayFactory.cpp index 0e1b2ac044..e8247482ea 100644 --- a/soh/soh/resource/importer/ArrayFactory.cpp +++ b/soh/soh/resource/importer/ArrayFactory.cpp @@ -1,7 +1,7 @@ +#include + #include "soh/resource/importer/ArrayFactory.h" #include "soh/resource/type/Array.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/AudioSampleFactory.cpp b/soh/soh/resource/importer/AudioSampleFactory.cpp index 065e6bb325..e979a99b56 100644 --- a/soh/soh/resource/importer/AudioSampleFactory.cpp +++ b/soh/soh/resource/importer/AudioSampleFactory.cpp @@ -1,12 +1,16 @@ -#include "soh/resource/importer/AudioSampleFactory.h" -#include "soh/resource/importer/AudioSoundFontFactory.h" -#include "soh/resource/type/AudioSample.h" -#include "spdlog/spdlog.h" -#include "z64.h" -#include "z64audio.h" #include #include #include + +#include "soh/resource/importer/AudioSampleFactory.h" +#include "soh/resource/importer/AudioSoundFontFactory.h" +#include "soh/resource/type/AudioSample.h" + +extern "C" { +#include "z64.h" +#include "z64audio.h" +} + #define DR_WAV_IMPLEMENTATION #include diff --git a/soh/soh/resource/importer/AudioSequenceFactory.cpp b/soh/soh/resource/importer/AudioSequenceFactory.cpp index 3cfc77515f..118f302eda 100644 --- a/soh/soh/resource/importer/AudioSequenceFactory.cpp +++ b/soh/soh/resource/importer/AudioSequenceFactory.cpp @@ -1,14 +1,14 @@ -#include "soh/resource/importer/AudioSequenceFactory.h" -#include "soh/resource/importer/AudioSoundFontFactory.h" -#include "soh/resource/type/AudioSequence.h" -#include "spdlog/spdlog.h" +#include + #include #include - #include #include #include -#include + +#include "soh/resource/importer/AudioSequenceFactory.h" +#include "soh/resource/importer/AudioSoundFontFactory.h" +#include "soh/resource/type/AudioSequence.h" namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/BackgroundFactory.cpp b/soh/soh/resource/importer/BackgroundFactory.cpp index 763690a3f9..f2985145a7 100644 --- a/soh/soh/resource/importer/BackgroundFactory.cpp +++ b/soh/soh/resource/importer/BackgroundFactory.cpp @@ -1,6 +1,5 @@ #include "soh/resource/importer/BackgroundFactory.h" #include "soh/resource/type/Background.h" -#include "spdlog/spdlog.h" namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/CollisionHeaderFactory.cpp b/soh/soh/resource/importer/CollisionHeaderFactory.cpp index 8a024ec7f7..42d0e8ddb8 100644 --- a/soh/soh/resource/importer/CollisionHeaderFactory.cpp +++ b/soh/soh/resource/importer/CollisionHeaderFactory.cpp @@ -1,7 +1,7 @@ +#include + #include "soh/resource/importer/CollisionHeaderFactory.h" #include "soh/resource/type/CollisionHeader.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/PathFactory.cpp b/soh/soh/resource/importer/PathFactory.cpp index 0aa01ed43a..fe4692f750 100644 --- a/soh/soh/resource/importer/PathFactory.cpp +++ b/soh/soh/resource/importer/PathFactory.cpp @@ -1,9 +1,9 @@ +#include +#include + #include "soh/resource/importer/PathFactory.h" #include "soh/resource/type/Path.h" #include "soh/resource/logging/PathLogger.h" -#include "spdlog/spdlog.h" -#include -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/PlayerAnimationFactory.cpp b/soh/soh/resource/importer/PlayerAnimationFactory.cpp index 5543cf4187..7834b80c19 100644 --- a/soh/soh/resource/importer/PlayerAnimationFactory.cpp +++ b/soh/soh/resource/importer/PlayerAnimationFactory.cpp @@ -1,6 +1,5 @@ #include "soh/resource/importer/PlayerAnimationFactory.h" #include "soh/resource/type/PlayerAnimation.h" -#include "spdlog/spdlog.h" namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/SkeletonLimbFactory.cpp b/soh/soh/resource/importer/SkeletonLimbFactory.cpp index 96d5c49de2..0590a1e4b7 100644 --- a/soh/soh/resource/importer/SkeletonLimbFactory.cpp +++ b/soh/soh/resource/importer/SkeletonLimbFactory.cpp @@ -1,9 +1,9 @@ -#include "soh/resource/importer/SkeletonLimbFactory.h" -#include "soh/resource/type/SkeletonLimb.h" -#include #include #include +#include "soh/resource/importer/SkeletonLimbFactory.h" +#include "soh/resource/type/SkeletonLimb.h" + namespace SOH { std::shared_ptr ResourceFactoryBinarySkeletonLimbV0::ReadResource(std::shared_ptr file, diff --git a/soh/soh/resource/importer/TextFactory.cpp b/soh/soh/resource/importer/TextFactory.cpp index 0a2c1afb40..af6088da5a 100644 --- a/soh/soh/resource/importer/TextFactory.cpp +++ b/soh/soh/resource/importer/TextFactory.cpp @@ -1,7 +1,7 @@ +#include + #include "soh/resource/importer/TextFactory.h" #include "soh/resource/type/Text.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp b/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp index b54f1cadeb..afbe06f154 100644 --- a/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp @@ -1,7 +1,6 @@ #include "soh/resource/importer/scenecommand/EndMarkerFactory.h" #include "soh/resource/type/scenecommand/EndMarker.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" namespace SOH { std::shared_ptr EndMarkerFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp index 97ebdfc052..351178de36 100644 --- a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp @@ -1,6 +1,5 @@ #include "soh/resource/importer/scenecommand/SceneCommandFactory.h" #include "soh/resource/type/scenecommand/SceneCommand.h" -#include "spdlog/spdlog.h" namespace SOH { void SceneCommandFactoryBinaryV0::ReadCommandId(std::shared_ptr command, diff --git a/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp index 90367e9a99..5180c69967 100644 --- a/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetActorListFactory.h" #include "soh/resource/type/scenecommand/SetActorList.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetActorListFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp index e2f4de65bd..d3330e8216 100644 --- a/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetCameraSettingsFactory.h" #include "soh/resource/type/scenecommand/SetCameraSettings.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp index eb54b0a225..f28a770a5c 100644 --- a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp @@ -1,7 +1,6 @@ #include "soh/resource/importer/scenecommand/SetCsCameraFactory.h" #include "soh/resource/type/scenecommand/SetCsCamera.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" namespace SOH { std::shared_ptr SetCsCameraFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp index 3352a2ef27..98d3eafdb8 100644 --- a/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetEchoSettingsFactory.h" #include "soh/resource/type/scenecommand/SetEchoSettings.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetEchoSettingsFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp index d0fd94821d..abb1879314 100644 --- a/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetEntranceListFactory.h" #include "soh/resource/type/scenecommand/SetEntranceList.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetEntranceListFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp index 9049b098cb..292cd1add5 100644 --- a/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetExitListFactory.h" #include "soh/resource/type/scenecommand/SetExitList.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetExitListFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp index 9ba49d4b37..8427434e9a 100644 --- a/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetLightListFactory.h" #include "soh/resource/type/scenecommand/SetLightList.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetLightListFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp index 01c5d59e12..90b5aac95e 100644 --- a/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetLightingSettingsFactory.h" #include "soh/resource/type/scenecommand/SetLightingSettings.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp b/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp index 4595192557..ffd8775377 100644 --- a/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp @@ -1,10 +1,9 @@ +#include +#include + #include "soh/resource/importer/scenecommand/SetMeshFactory.h" #include "soh/resource/type/scenecommand/SetMesh.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include -#include -#include -#include namespace SOH { std::shared_ptr SetMeshFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp index 35857a409f..23c55a7a2b 100644 --- a/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetObjectListFactory.h" #include "soh/resource/type/scenecommand/SetObjectList.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetObjectListFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp b/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp index 9b18593f53..f47f4f00c2 100644 --- a/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetRoomBehaviorFactory.h" #include "soh/resource/type/scenecommand/SetRoomBehavior.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetRoomBehaviorFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp index c202ca8128..131f3f5a1c 100644 --- a/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp @@ -1,9 +1,9 @@ +#include +#include + #include "soh/resource/importer/scenecommand/SetRoomListFactory.h" #include "soh/resource/type/scenecommand/SetRoomList.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include -#include -#include namespace SOH { std::shared_ptr SetRoomListFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp index a071cc4d02..60fb7a607c 100644 --- a/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetSkyboxModifierFactory.h" #include "soh/resource/type/scenecommand/SetSkyboxModifier.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp index 3434505cb0..0dddbf2cf6 100644 --- a/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.h" #include "soh/resource/type/scenecommand/SetSkyboxSettings.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp index a72acce8cc..c3deee9fd2 100644 --- a/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetSoundSettingsFactory.h" #include "soh/resource/type/scenecommand/SetSoundSettings.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetSoundSettingsFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp index 2877dc88aa..d6da7e6766 100644 --- a/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetSpecialObjectsFactory.h" #include "soh/resource/type/scenecommand/SetSpecialObjects.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp index d25c9aeab8..65d9b789b4 100644 --- a/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetStartPositionListFactory.h" #include "soh/resource/type/scenecommand/SetStartPositionList.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp index 7145702082..0a392c7832 100644 --- a/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetTimeSettingsFactory.h" #include "soh/resource/type/scenecommand/SetTimeSettings.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetTimeSettingsFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp index e222fb789f..ebdf84489a 100644 --- a/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetTransitionActorListFactory.h" #include "soh/resource/type/scenecommand/SetTransitionActorList.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr diff --git a/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp index 86f0af5151..a69e7971d4 100644 --- a/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp +++ b/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp @@ -1,8 +1,8 @@ +#include + #include "soh/resource/importer/scenecommand/SetWindSettingsFactory.h" #include "soh/resource/type/scenecommand/SetWindSettings.h" #include "soh/resource/logging/SceneCommandLoggers.h" -#include "spdlog/spdlog.h" -#include namespace SOH { std::shared_ptr SetWindSettingsFactory::ReadResource(std::shared_ptr initData, diff --git a/soh/soh/resource/logging/PathLogger.h b/soh/soh/resource/logging/PathLogger.h index f9bfcb2527..39c78dda8f 100644 --- a/soh/soh/resource/logging/PathLogger.h +++ b/soh/soh/resource/logging/PathLogger.h @@ -1,7 +1,6 @@ #pragma once #include -#include "soh/OTRGlobals.h" #include "soh/cvar_prefixes.h" namespace SOH { diff --git a/soh/soh/resource/logging/SceneCommandLoggers.h b/soh/soh/resource/logging/SceneCommandLoggers.h index d5790044d4..3ad09f91e0 100644 --- a/soh/soh/resource/logging/SceneCommandLoggers.h +++ b/soh/soh/resource/logging/SceneCommandLoggers.h @@ -1,7 +1,6 @@ #pragma once #include -#include "soh/OTRGlobals.h" #include "soh/cvar_prefixes.h" namespace SOH { diff --git a/soh/soh/resource/type/CollisionHeader.h b/soh/soh/resource/type/CollisionHeader.h index 7479de99ea..daba15fdad 100644 --- a/soh/soh/resource/type/CollisionHeader.h +++ b/soh/soh/resource/type/CollisionHeader.h @@ -3,7 +3,6 @@ #include #include #include -#include #include "z64math.h" namespace SOH { diff --git a/soh/soh/resource/type/Cutscene.cpp b/soh/soh/resource/type/Cutscene.cpp index fec43126c4..d92d2d795b 100644 --- a/soh/soh/resource/type/Cutscene.cpp +++ b/soh/soh/resource/type/Cutscene.cpp @@ -1,5 +1,4 @@ #include "Cutscene.h" -#include namespace SOH { uint32_t* Cutscene::GetPointer() { diff --git a/soh/soh/resource/type/PlayerAnimation.cpp b/soh/soh/resource/type/PlayerAnimation.cpp index 46ba8a1900..381813ccc5 100644 --- a/soh/soh/resource/type/PlayerAnimation.cpp +++ b/soh/soh/resource/type/PlayerAnimation.cpp @@ -1,5 +1,4 @@ #include "PlayerAnimation.h" -#include namespace SOH { int16_t* PlayerAnimation::GetPointer() { diff --git a/soh/soh/resource/type/Skeleton.cpp b/soh/soh/resource/type/Skeleton.cpp index 704d7e8725..eac1255172 100644 --- a/soh/soh/resource/type/Skeleton.cpp +++ b/soh/soh/resource/type/Skeleton.cpp @@ -1,13 +1,13 @@ -#include "Skeleton.h" -#include "soh/OTRGlobals.h" -#include -#include -#include #include #include +#include "Skeleton.h" +#include "soh/OTRGlobals.h" + extern "C" { -#include "variables.h" +#include +#include +#include #include "z64.h" #include "macros.h" #include "z64player.h" diff --git a/soh/soh/resource/type/SkeletonLimb.h b/soh/soh/resource/type/SkeletonLimb.h index 84acd77415..42224d449e 100644 --- a/soh/soh/resource/type/SkeletonLimb.h +++ b/soh/soh/resource/type/SkeletonLimb.h @@ -1,7 +1,6 @@ #pragma once #include -#include "libultraship/libultra.h" #include "z64math.h" namespace SOH { diff --git a/soh/soh/resource/type/Text.h b/soh/soh/resource/type/Text.h index a9f00ef277..45275b1cea 100644 --- a/soh/soh/resource/type/Text.h +++ b/soh/soh/resource/type/Text.h @@ -3,7 +3,6 @@ #include #include #include -#include namespace SOH { // TODO: we've moved away from using classes for this stuff diff --git a/soh/soh/resource/type/scenecommand/EndMarker.h b/soh/soh/resource/type/scenecommand/EndMarker.h index bb3614eefb..3dfd615ea7 100644 --- a/soh/soh/resource/type/scenecommand/EndMarker.h +++ b/soh/soh/resource/type/scenecommand/EndMarker.h @@ -1,7 +1,6 @@ #pragma once #include "SceneCommand.h" -#include namespace SOH { typedef struct { diff --git a/soh/soh/resource/type/scenecommand/SetCameraSettings.h b/soh/soh/resource/type/scenecommand/SetCameraSettings.h index 741d503d5f..011477aed4 100644 --- a/soh/soh/resource/type/scenecommand/SetCameraSettings.h +++ b/soh/soh/resource/type/scenecommand/SetCameraSettings.h @@ -2,7 +2,6 @@ #include #include "SceneCommand.h" -#include namespace SOH { typedef struct { diff --git a/soh/soh/resource/type/scenecommand/SetCsCamera.h b/soh/soh/resource/type/scenecommand/SetCsCamera.h index fcb48d4031..efb8620d99 100644 --- a/soh/soh/resource/type/scenecommand/SetCsCamera.h +++ b/soh/soh/resource/type/scenecommand/SetCsCamera.h @@ -1,7 +1,6 @@ #pragma once #include "SceneCommand.h" -#include namespace SOH { typedef struct { diff --git a/soh/soh/resource/type/scenecommand/SetEchoSettings.h b/soh/soh/resource/type/scenecommand/SetEchoSettings.h index 170e36d292..51e1e30b18 100644 --- a/soh/soh/resource/type/scenecommand/SetEchoSettings.h +++ b/soh/soh/resource/type/scenecommand/SetEchoSettings.h @@ -2,7 +2,6 @@ #include #include "SceneCommand.h" -#include namespace SOH { typedef struct { diff --git a/soh/soh/resource/type/scenecommand/SetEntranceList.h b/soh/soh/resource/type/scenecommand/SetEntranceList.h index 19e0129cb3..5e15d8dc5a 100644 --- a/soh/soh/resource/type/scenecommand/SetEntranceList.h +++ b/soh/soh/resource/type/scenecommand/SetEntranceList.h @@ -2,7 +2,6 @@ #include #include -#include #include "SceneCommand.h" #include diff --git a/soh/soh/resource/type/scenecommand/SetLightList.h b/soh/soh/resource/type/scenecommand/SetLightList.h index a0d0cd1bb2..7f8898be30 100644 --- a/soh/soh/resource/type/scenecommand/SetLightList.h +++ b/soh/soh/resource/type/scenecommand/SetLightList.h @@ -2,7 +2,6 @@ #include #include -#include #include "SceneCommand.h" #include diff --git a/soh/soh/resource/type/scenecommand/SetMesh.h b/soh/soh/resource/type/scenecommand/SetMesh.h index 3843da8196..d81c969da0 100644 --- a/soh/soh/resource/type/scenecommand/SetMesh.h +++ b/soh/soh/resource/type/scenecommand/SetMesh.h @@ -2,9 +2,7 @@ #include #include -#include #include "SceneCommand.h" -#include "libultraship/libultra.h" #include "z64math.h" namespace SOH { diff --git a/soh/soh/resource/type/scenecommand/SetObjectList.h b/soh/soh/resource/type/scenecommand/SetObjectList.h index 0286f09164..4d8b6704b9 100644 --- a/soh/soh/resource/type/scenecommand/SetObjectList.h +++ b/soh/soh/resource/type/scenecommand/SetObjectList.h @@ -2,7 +2,6 @@ #include #include -#include #include "SceneCommand.h" #include diff --git a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h index 7df68934a7..6707c37499 100644 --- a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h +++ b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h @@ -1,7 +1,6 @@ #pragma once #include -#include #include "SceneCommand.h" namespace SOH { diff --git a/soh/soh/resource/type/scenecommand/SetRoomList.h b/soh/soh/resource/type/scenecommand/SetRoomList.h index 0fe114e899..40fdf7c13f 100644 --- a/soh/soh/resource/type/scenecommand/SetRoomList.h +++ b/soh/soh/resource/type/scenecommand/SetRoomList.h @@ -2,7 +2,6 @@ #include #include -#include #include #include "SceneCommand.h" #include "RomFile.h" diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h index 73d23cc06b..7db5c7899f 100644 --- a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h +++ b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h @@ -1,7 +1,6 @@ #pragma once #include -#include #include "SceneCommand.h" namespace SOH { diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h index 69c26196d0..121864976e 100644 --- a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h +++ b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h @@ -2,7 +2,6 @@ #include #include "SceneCommand.h" -#include namespace SOH { typedef struct { diff --git a/soh/soh/resource/type/scenecommand/SetSoundSettings.h b/soh/soh/resource/type/scenecommand/SetSoundSettings.h index d2db2b8c50..4b2aad73d6 100644 --- a/soh/soh/resource/type/scenecommand/SetSoundSettings.h +++ b/soh/soh/resource/type/scenecommand/SetSoundSettings.h @@ -2,7 +2,6 @@ #include #include "SceneCommand.h" -#include namespace SOH { typedef struct { diff --git a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h index b7c233694b..df1cb0b5f7 100644 --- a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h +++ b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h @@ -2,7 +2,6 @@ #include #include "SceneCommand.h" -#include namespace SOH { typedef struct { diff --git a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h index cb170f7e88..be2550d7b0 100644 --- a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h +++ b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h @@ -2,7 +2,6 @@ #include #include -#include #include "SceneCommand.h" // #include #include "z64math.h" diff --git a/soh/soh/resource/type/scenecommand/SetWindSettings.h b/soh/soh/resource/type/scenecommand/SetWindSettings.h index 8a8374e1ca..56a21a7db6 100644 --- a/soh/soh/resource/type/scenecommand/SetWindSettings.h +++ b/soh/soh/resource/type/scenecommand/SetWindSettings.h @@ -3,7 +3,6 @@ #include #include #include "SceneCommand.h" -#include namespace SOH { typedef struct { diff --git a/soh/soh/stubs.c b/soh/soh/stubs.c index 7ea0052091..2b0323c379 100644 --- a/soh/soh/stubs.c +++ b/soh/soh/stubs.c @@ -1,7 +1,7 @@ -#include #include #include #include + #include "z64.h" u32 osResetType; diff --git a/soh/soh/util.cpp b/soh/soh/util.cpp index d331eb3a75..daec2c288c 100644 --- a/soh/soh/util.cpp +++ b/soh/soh/util.cpp @@ -1,13 +1,16 @@ -#include "util.h" - #include #include #include #include #include + #include -#include "Enhancements/randomizer/randomizerTypes.h" + +#include "util.h" + +extern "C" { #include +} std::string invalidString = ""; diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp index 9d390cc821..1d2a70cfce 100644 --- a/soh/soh/z_message_OTR.cpp +++ b/soh/soh/z_message_OTR.cpp @@ -1,9 +1,11 @@ #include #include -#include -#include "global.h" + #include "soh/resource/type/Text.h" + +extern "C" { #include +} extern "C" MessageTableEntry* sNesMessageEntryTablePtr; extern "C" MessageTableEntry* sGerMessageEntryTablePtr; diff --git a/soh/soh/z_play_otr.cpp b/soh/soh/z_play_otr.cpp index 719f2076a2..a9537cea22 100644 --- a/soh/soh/z_play_otr.cpp +++ b/soh/soh/z_play_otr.cpp @@ -1,11 +1,16 @@ -#include "ResourceManagerHelpers.h" -#include "soh/resource/type/Scene.h" #include #include #include #include + +#include "ResourceManagerHelpers.h" +#include "soh/resource/type/Scene.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" -#include "global.h" + +extern "C" { +#include "functions.h" +#include "variables.h" +} extern "C" void Play_InitScene(PlayState* play, s32 spawn); extern "C" void Play_InitEnvironment(PlayState* play, s16 skyboxId); diff --git a/soh/soh/z_scene_otr.cpp b/soh/soh/z_scene_otr.cpp index ab59068e68..72e2f063e8 100644 --- a/soh/soh/z_scene_otr.cpp +++ b/soh/soh/z_scene_otr.cpp @@ -1,13 +1,12 @@ +#include +#include + +#include +#include + #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "ResourceManagerHelpers.h" #include "soh/resource/type/Scene.h" -#include "global.h" -#include "vt.h" -#include "soh/resource/type/CollisionHeader.h" -#include "soh/resource/type/Cutscene.h" -#include -#include -#include #include "soh/resource/type/scenecommand/SetCameraSettings.h" #include "soh/resource/type/scenecommand/SetCutscenes.h" #include "soh/resource/type/scenecommand/SetStartPositionList.h" @@ -29,7 +28,13 @@ #include "soh/resource/type/scenecommand/SetSoundSettings.h" #include "soh/resource/type/scenecommand/SetEchoSettings.h" #include "soh/resource/type/scenecommand/SetAlternateHeaders.h" -#include + +extern "C" { +#include "functions.h" +#include "macros.h" +#include "variables.h" +#include "vt.h" +} extern Ship::IResource* OTRPlay_LoadFile(PlayState* play, const char* fileName); extern "C" s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId);