From d9d6dbdf51fab429bcb7d16cad1233149eb81d56 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Sat, 5 Oct 2024 10:06:49 -0500 Subject: [PATCH] Remove unnecessary headers in favor of directory headers (#800) --- mm/2s2h/BenGui/BenMenuBar.cpp | 6 --- mm/2s2h/BenGui/Menu.cpp | 2 - mm/2s2h/BenGui/SearchableMenuItems.h | 1 - mm/2s2h/Enhancements/Camera/Camera.h | 8 ++++ .../Camera/CameraInterpolationFixes.cpp | 2 +- .../Camera/CameraInterpolationFixes.h | 6 --- mm/2s2h/Enhancements/Camera/DebugCam.cpp | 1 - mm/2s2h/Enhancements/Camera/DebugCam.h | 6 --- mm/2s2h/Enhancements/Camera/FreeLook.cpp | 1 - mm/2s2h/Enhancements/Camera/FreeLook.h | 6 --- mm/2s2h/Enhancements/Cheats/Cheats.h | 5 +++ mm/2s2h/Enhancements/Cheats/Infinite.cpp | 1 - mm/2s2h/Enhancements/Cheats/Infinite.h | 6 --- mm/2s2h/Enhancements/Cheats/MoonJump.cpp | 1 - mm/2s2h/Enhancements/Cheats/MoonJump.h | 6 --- mm/2s2h/Enhancements/Cheats/TimeStop.h | 6 --- .../Cheats/UnbreakableRazorSword.h | 6 --- .../Enhancements/Cheats/UnrestrictedItems.h | 6 --- mm/2s2h/Enhancements/Cycle/Cycle.h | 6 +++ mm/2s2h/Enhancements/Cycle/EndOfCycle.h | 6 --- .../Dialogue/FastBankSelection.cpp | 3 ++ mm/2s2h/Enhancements/Enhancements.h | 44 +++++-------------- mm/2s2h/Enhancements/Equipment/Equipment.h | 7 +++ .../Enhancements/Equipment/InstantRecall.cpp | 3 +- .../Enhancements/Equipment/InstantRecall.h | 6 --- .../Equipment/SkipMagicArrowEquip.cpp | 4 +- .../Equipment/SkipMagicArrowEquip.h | 6 --- mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp | 1 - mm/2s2h/Enhancements/Graphics/3DItemDrops.h | 6 --- mm/2s2h/Enhancements/Graphics/3DSClock.h | 6 --- .../Graphics/DisableBlackBars.cpp | 1 - .../Enhancements/Graphics/DisableBlackBars.h | 6 --- mm/2s2h/Enhancements/Graphics/Graphics.h | 23 ++++++++++ mm/2s2h/Enhancements/Graphics/MotionBlur.cpp | 1 - mm/2s2h/Enhancements/Graphics/MotionBlur.h | 18 -------- mm/2s2h/Enhancements/Graphics/PlayAsKafei.cpp | 1 - mm/2s2h/Enhancements/Graphics/PlayAsKafei.h | 8 ---- .../Enhancements/Graphics/TextBasedClock.h | 6 --- mm/2s2h/Enhancements/Masks/BlastMaskKeg.cpp | 2 +- mm/2s2h/Enhancements/Masks/BlastMaskKeg.h | 6 --- .../Enhancements/Masks/FastTransformation.h | 6 --- .../Enhancements/Masks/FierceDeityAnywhere.h | 6 --- mm/2s2h/Enhancements/Masks/Masks.h | 11 +++++ .../Enhancements/Masks/NoBlastMaskCooldown.h | 6 --- mm/2s2h/Enhancements/Masks/PersistentMasks.h | 7 --- .../Minigames/AlwaysWinDoggyRace.h | 6 --- mm/2s2h/Enhancements/Minigames/Minigames.h | 6 +++ mm/2s2h/Enhancements/Modes/Modes.h | 6 +++ .../Modes/TimeMovesWhenYouMove.cpp | 1 - .../Enhancements/Modes/TimeMovesWhenYouMove.h | 6 --- .../Enhancements/Player/FastFlowerLaunch.cpp | 1 - .../Restorations/FlipHopVariable.h | 6 --- .../Restorations/PowerCrouchStab.h | 6 --- .../Enhancements/Restorations/Restorations.h | 4 ++ mm/2s2h/Enhancements/Restorations/SideRoll.h | 6 --- mm/2s2h/Enhancements/Restorations/TatlISG.h | 6 --- mm/2s2h/Enhancements/Songs/EnableSunsSong.h | 6 --- mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp | 1 - mm/2s2h/Enhancements/Songs/PauseOwlWarp.h | 15 ------- mm/2s2h/Enhancements/Songs/Songs.h | 18 ++++++++ mm/2s2h/Enhancements/Songs/ZoraEggCount.cpp | 1 - mm/2s2h/Enhancements/Songs/ZoraEggCount.h | 6 --- mm/src/code/z_camera.c | 2 +- mm/src/code/z_play.c | 2 +- .../ovl_kaleido_scope/z_kaleido_map.c | 2 +- .../ovl_kaleido_scope/z_kaleido_scope_NES.c | 2 +- 66 files changed, 117 insertions(+), 274 deletions(-) create mode 100644 mm/2s2h/Enhancements/Camera/Camera.h delete mode 100644 mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.h delete mode 100644 mm/2s2h/Enhancements/Camera/DebugCam.h delete mode 100644 mm/2s2h/Enhancements/Camera/FreeLook.h delete mode 100644 mm/2s2h/Enhancements/Cheats/Infinite.h delete mode 100644 mm/2s2h/Enhancements/Cheats/MoonJump.h delete mode 100644 mm/2s2h/Enhancements/Cheats/TimeStop.h delete mode 100644 mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.h delete mode 100644 mm/2s2h/Enhancements/Cheats/UnrestrictedItems.h create mode 100644 mm/2s2h/Enhancements/Cycle/Cycle.h delete mode 100644 mm/2s2h/Enhancements/Cycle/EndOfCycle.h create mode 100644 mm/2s2h/Enhancements/Equipment/Equipment.h delete mode 100644 mm/2s2h/Enhancements/Equipment/InstantRecall.h delete mode 100644 mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.h delete mode 100644 mm/2s2h/Enhancements/Graphics/3DItemDrops.h delete mode 100644 mm/2s2h/Enhancements/Graphics/3DSClock.h delete mode 100644 mm/2s2h/Enhancements/Graphics/DisableBlackBars.h create mode 100644 mm/2s2h/Enhancements/Graphics/Graphics.h delete mode 100644 mm/2s2h/Enhancements/Graphics/MotionBlur.h delete mode 100644 mm/2s2h/Enhancements/Graphics/PlayAsKafei.h delete mode 100644 mm/2s2h/Enhancements/Graphics/TextBasedClock.h delete mode 100644 mm/2s2h/Enhancements/Masks/BlastMaskKeg.h delete mode 100644 mm/2s2h/Enhancements/Masks/FastTransformation.h delete mode 100644 mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.h create mode 100644 mm/2s2h/Enhancements/Masks/Masks.h delete mode 100644 mm/2s2h/Enhancements/Masks/NoBlastMaskCooldown.h delete mode 100644 mm/2s2h/Enhancements/Masks/PersistentMasks.h delete mode 100644 mm/2s2h/Enhancements/Minigames/AlwaysWinDoggyRace.h create mode 100644 mm/2s2h/Enhancements/Minigames/Minigames.h create mode 100644 mm/2s2h/Enhancements/Modes/Modes.h delete mode 100644 mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.h delete mode 100644 mm/2s2h/Enhancements/Restorations/FlipHopVariable.h delete mode 100644 mm/2s2h/Enhancements/Restorations/PowerCrouchStab.h delete mode 100644 mm/2s2h/Enhancements/Restorations/SideRoll.h delete mode 100644 mm/2s2h/Enhancements/Restorations/TatlISG.h delete mode 100644 mm/2s2h/Enhancements/Songs/EnableSunsSong.h delete mode 100644 mm/2s2h/Enhancements/Songs/PauseOwlWarp.h create mode 100644 mm/2s2h/Enhancements/Songs/Songs.h delete mode 100644 mm/2s2h/Enhancements/Songs/ZoraEggCount.h diff --git a/mm/2s2h/BenGui/BenMenuBar.cpp b/mm/2s2h/BenGui/BenMenuBar.cpp index 962132b5f..e8f7d7352 100644 --- a/mm/2s2h/BenGui/BenMenuBar.cpp +++ b/mm/2s2h/BenGui/BenMenuBar.cpp @@ -8,13 +8,7 @@ #include #include #include "2s2h/Enhancements/Enhancements.h" -#include "2s2h/Enhancements/Graphics/3DItemDrops.h" -#include "2s2h/Enhancements/Graphics/MotionBlur.h" -#include "2s2h/Enhancements/Graphics/PlayAsKafei.h" -#include "2s2h/Enhancements/Modes/TimeMovesWhenYouMove.h" #include "2s2h/DeveloperTools/DeveloperTools.h" -#include "2s2h/Enhancements/Cheats/Cheats.h" -#include "2s2h/Enhancements/Player/Player.h" #include "HudEditor.h" extern "C" { diff --git a/mm/2s2h/BenGui/Menu.cpp b/mm/2s2h/BenGui/Menu.cpp index f83d59c80..9727b58ed 100644 --- a/mm/2s2h/BenGui/Menu.cpp +++ b/mm/2s2h/BenGui/Menu.cpp @@ -4,8 +4,6 @@ #include "UIWidgets.hpp" #include "graphic/Fast3D/gfx_rendering_api.h" #include "2s2h/Enhancements/Enhancements.h" -#include "2s2h/Enhancements/Graphics/MotionBlur.h" -#include "2s2h/Enhancements/Graphics/PlayAsKafei.h" #include "2s2h/DeveloperTools/DeveloperTools.h" #include "window/gui/GuiMenuBar.h" #include "window/gui/GuiElement.h" diff --git a/mm/2s2h/BenGui/SearchableMenuItems.h b/mm/2s2h/BenGui/SearchableMenuItems.h index 2cf52494f..95785d296 100644 --- a/mm/2s2h/BenGui/SearchableMenuItems.h +++ b/mm/2s2h/BenGui/SearchableMenuItems.h @@ -1,6 +1,5 @@ #include "2s2h/Enhancements/Enhancements.h" #include "2s2h/DeveloperTools/DeveloperTools.h" -#include "2s2h/Enhancements/Graphics/3DItemDrops.h" #include "UIWidgets.hpp" #include "BenMenuBar.h" #include "macros.h" diff --git a/mm/2s2h/Enhancements/Camera/Camera.h b/mm/2s2h/Enhancements/Camera/Camera.h new file mode 100644 index 000000000..54a035dff --- /dev/null +++ b/mm/2s2h/Enhancements/Camera/Camera.h @@ -0,0 +1,8 @@ +#ifndef CAMERA_H +#define CAMERA_H + +void RegisterCameraInterpolationFixes(); +void RegisterDebugCam(); +void RegisterCameraFreeLook(); + +#endif // CAMERA_H diff --git a/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp b/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp index cb02a2143..ac73872bd 100644 --- a/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp +++ b/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp @@ -1,4 +1,4 @@ -#include "CameraInterpolationFixes.h" +#include "Camera.h" #include #include "Enhancements/GameInteractor/GameInteractor.h" #include "CameraUtils.h" diff --git a/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.h b/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.h deleted file mode 100644 index f159e197e..000000000 --- a/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CAMERA_INTERPOLATE_FIXES_H -#define CAMERA_INTERPOLATE_FIXES_H - -void RegisterCameraInterpolationFixes(); - -#endif // CAMERA_INTERPOLATE_FIXES_H diff --git a/mm/2s2h/Enhancements/Camera/DebugCam.cpp b/mm/2s2h/Enhancements/Camera/DebugCam.cpp index 9ec56343a..f5bcc0d7b 100644 --- a/mm/2s2h/Enhancements/Camera/DebugCam.cpp +++ b/mm/2s2h/Enhancements/Camera/DebugCam.cpp @@ -1,4 +1,3 @@ -#include "DebugCam.h" #include #include "Enhancements/GameInteractor/GameInteractor.h" #include "CameraUtils.h" diff --git a/mm/2s2h/Enhancements/Camera/DebugCam.h b/mm/2s2h/Enhancements/Camera/DebugCam.h deleted file mode 100644 index c61a12695..000000000 --- a/mm/2s2h/Enhancements/Camera/DebugCam.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef FREE_CAM_H -#define FREE_CAM_H - -void RegisterDebugCam(); - -#endif // FREE_CAM_H diff --git a/mm/2s2h/Enhancements/Camera/FreeLook.cpp b/mm/2s2h/Enhancements/Camera/FreeLook.cpp index ade91b987..265edd5ee 100644 --- a/mm/2s2h/Enhancements/Camera/FreeLook.cpp +++ b/mm/2s2h/Enhancements/Camera/FreeLook.cpp @@ -1,4 +1,3 @@ -#include "FreeLook.h" #include #include "Enhancements/GameInteractor/GameInteractor.h" #include "CameraUtils.h" diff --git a/mm/2s2h/Enhancements/Camera/FreeLook.h b/mm/2s2h/Enhancements/Camera/FreeLook.h deleted file mode 100644 index 96c236fc1..000000000 --- a/mm/2s2h/Enhancements/Camera/FreeLook.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef FREE_LOOK_H -#define FREE_LOOK_H - -void RegisterCameraFreeLook(); - -#endif // FREE_LOOK_H diff --git a/mm/2s2h/Enhancements/Cheats/Cheats.h b/mm/2s2h/Enhancements/Cheats/Cheats.h index 497f5e2c5..f89dc877c 100644 --- a/mm/2s2h/Enhancements/Cheats/Cheats.h +++ b/mm/2s2h/Enhancements/Cheats/Cheats.h @@ -1,6 +1,11 @@ #ifndef CHEATS_H #define CHEATS_H +void RegisterInfiniteCheats(); void RegisterLongerFlowerGlide(); +void RegisterMoonJumpOnL(); +void RegisterTimeStopInTemples(); +void RegisterUnbreakableRazorSword(); +void RegisterUnrestrictedItems(); #endif // CHEATS_H diff --git a/mm/2s2h/Enhancements/Cheats/Infinite.cpp b/mm/2s2h/Enhancements/Cheats/Infinite.cpp index ff542feab..308a43c80 100644 --- a/mm/2s2h/Enhancements/Cheats/Infinite.cpp +++ b/mm/2s2h/Enhancements/Cheats/Infinite.cpp @@ -1,4 +1,3 @@ -#include "Infinite.h" #include #include "Enhancements/GameInteractor/GameInteractor.h" #include "variables.h" diff --git a/mm/2s2h/Enhancements/Cheats/Infinite.h b/mm/2s2h/Enhancements/Cheats/Infinite.h deleted file mode 100644 index 7bdffc6cc..000000000 --- a/mm/2s2h/Enhancements/Cheats/Infinite.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CHEATS_INFINITE_H -#define CHEATS_INFINITE_H - -void RegisterInfiniteCheats(); - -#endif // CHEATS_INFINITE_H diff --git a/mm/2s2h/Enhancements/Cheats/MoonJump.cpp b/mm/2s2h/Enhancements/Cheats/MoonJump.cpp index bc12b95bb..2c406ef7e 100644 --- a/mm/2s2h/Enhancements/Cheats/MoonJump.cpp +++ b/mm/2s2h/Enhancements/Cheats/MoonJump.cpp @@ -1,4 +1,3 @@ -#include "MoonJump.h" #include #include "Enhancements/GameInteractor/GameInteractor.h" #include "variables.h" diff --git a/mm/2s2h/Enhancements/Cheats/MoonJump.h b/mm/2s2h/Enhancements/Cheats/MoonJump.h deleted file mode 100644 index 5f2727e82..000000000 --- a/mm/2s2h/Enhancements/Cheats/MoonJump.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CHEATS_MOONJUMP_H -#define CHEATS_MOONJUMP_H - -void RegisterMoonJumpOnL(); - -#endif // CHEATS_MOONJUMP_H diff --git a/mm/2s2h/Enhancements/Cheats/TimeStop.h b/mm/2s2h/Enhancements/Cheats/TimeStop.h deleted file mode 100644 index a2729fe2d..000000000 --- a/mm/2s2h/Enhancements/Cheats/TimeStop.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CHEATS_TIME_STOPS_H -#define CHEATS_TIME_STOPS_H - -void RegisterTimeStopInTemples(); - -#endif // CHEATS_TIME_STOPS_H \ No newline at end of file diff --git a/mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.h b/mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.h deleted file mode 100644 index 84c9f18aa..000000000 --- a/mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CHEATS_UNBREAKABLE_RAZOR_SWORD_H -#define CHEATS_UNBREAKABLE_RAZOR_SWORD_H - -void RegisterUnbreakableRazorSword(); - -#endif // CHEATS_UNBREAKABLE_RAZOR_SWORD_H diff --git a/mm/2s2h/Enhancements/Cheats/UnrestrictedItems.h b/mm/2s2h/Enhancements/Cheats/UnrestrictedItems.h deleted file mode 100644 index 94c3381bb..000000000 --- a/mm/2s2h/Enhancements/Cheats/UnrestrictedItems.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CHEATS_UNRESTRICTED_ITEMS_H -#define CHEATS_UNRESTRICTED_ITEMS_H - -void RegisterUnrestrictedItems(); - -#endif // CHEATS_UNRESTRICTED_ITEMS_H diff --git a/mm/2s2h/Enhancements/Cycle/Cycle.h b/mm/2s2h/Enhancements/Cycle/Cycle.h new file mode 100644 index 000000000..612ff1991 --- /dev/null +++ b/mm/2s2h/Enhancements/Cycle/Cycle.h @@ -0,0 +1,6 @@ +#ifndef CYCLE_H +#define CYCLE_H + +void RegisterEndOfCycleSaveHooks(); + +#endif // CYCLE_H diff --git a/mm/2s2h/Enhancements/Cycle/EndOfCycle.h b/mm/2s2h/Enhancements/Cycle/EndOfCycle.h deleted file mode 100644 index 57e4dfec0..000000000 --- a/mm/2s2h/Enhancements/Cycle/EndOfCycle.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CYCLES_END_H -#define CYCLES_END_H - -void RegisterEndOfCycleSaveHooks(); - -#endif // CYCLES_END_H diff --git a/mm/2s2h/Enhancements/Dialogue/FastBankSelection.cpp b/mm/2s2h/Enhancements/Dialogue/FastBankSelection.cpp index 1035fb398..c9f72647d 100644 --- a/mm/2s2h/Enhancements/Dialogue/FastBankSelection.cpp +++ b/mm/2s2h/Enhancements/Dialogue/FastBankSelection.cpp @@ -1,9 +1,12 @@ #include #include "Enhancements/GameInteractor/GameInteractor.h" + +extern "C" { #include "z64.h" #include "global.h" #include "overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h" +} static const char zeroRupees[3] = { '0', '0', '0' }; diff --git a/mm/2s2h/Enhancements/Enhancements.h b/mm/2s2h/Enhancements/Enhancements.h index 4e51dfac7..8ec82aa36 100644 --- a/mm/2s2h/Enhancements/Enhancements.h +++ b/mm/2s2h/Enhancements/Enhancements.h @@ -1,43 +1,21 @@ #ifndef ENHANCEMENTS_H #define ENHANCEMENTS_H -#include "Camera/CameraInterpolationFixes.h" -#include "Camera/DebugCam.h" -#include "Camera/FreeLook.h" -#include "Cheats/MoonJump.h" -#include "Cheats/Infinite.h" -#include "Dialogue/Dialogue.h" -#include "Graphics/TextBasedClock.h" -#include "Graphics/3DSClock.h" +#include "Camera/Camera.h" #include "Cheats/Cheats.h" -#include "Cheats/UnbreakableRazorSword.h" -#include "Cheats/UnrestrictedItems.h" -#include "Cheats/TimeStop.h" -#include "Cycle/EndOfCycle.h" -#include "Equipment/SkipMagicArrowEquip.h" -#include "Fixes/Fixes.h" -#include "Masks/BlastMaskKeg.h" -#include "Masks/FierceDeityAnywhere.h" -#include "Masks/NoBlastMaskCooldown.h" -#include "Masks/FastTransformation.h" -#include "Masks/PersistentMasks.h" -#include "Minigames/AlwaysWinDoggyRace.h" #include "Cutscenes/Cutscenes.h" -#include "Restorations/FlipHopVariable.h" -#include "Restorations/PowerCrouchStab.h" -#include "Restorations/Restorations.h" -#include "Restorations/SideRoll.h" -#include "Restorations/TatlISG.h" -#include "Graphics/3DItemDrops.h" -#include "Graphics/PlayAsKafei.h" -#include "Equipment/InstantRecall.h" +#include "Cycle/Cycle.h" +#include "Dialogue/Dialogue.h" +#include "Equipment/Equipment.h" +#include "Fixes/Fixes.h" +#include "Graphics/Graphics.h" +#include "Masks/Masks.h" +#include "Minigames/Minigames.h" +#include "Modes/Modes.h" #include "Player/Player.h" -#include "Songs/EnableSunsSong.h" -#include "Songs/PauseOwlWarp.h" -#include "Songs/ZoraEggCount.h" +#include "Restorations/Restorations.h" #include "Saving/SavingEnhancements.h" -#include "Graphics/DisableBlackBars.h" -#include "Modes/TimeMovesWhenYouMove.h" +#include "Songs/Songs.h" enum AlwaysWinDoggyRaceOptions { ALWAYS_WIN_DOGGY_RACE_OFF, diff --git a/mm/2s2h/Enhancements/Equipment/Equipment.h b/mm/2s2h/Enhancements/Equipment/Equipment.h new file mode 100644 index 000000000..ca23748c9 --- /dev/null +++ b/mm/2s2h/Enhancements/Equipment/Equipment.h @@ -0,0 +1,7 @@ +#ifndef EQUIPMENT_H +#define EQUIPMENT_H + +void RegisterInstantRecall(); +void RegisterSkipMagicArrowEquip(); + +#endif // EQUIPMENT_H diff --git a/mm/2s2h/Enhancements/Equipment/InstantRecall.cpp b/mm/2s2h/Enhancements/Equipment/InstantRecall.cpp index dad419353..eabbb7662 100644 --- a/mm/2s2h/Enhancements/Equipment/InstantRecall.cpp +++ b/mm/2s2h/Enhancements/Equipment/InstantRecall.cpp @@ -1,9 +1,8 @@ #include #include "Enhancements/GameInteractor/GameInteractor.h" -#include "InstantRecall.h" -#include "src/overlays/actors/ovl_En_Boom/z_en_boom.h" extern "C" { +#include "src/overlays/actors/ovl_En_Boom/z_en_boom.h" extern PlayState* gPlayState; } diff --git a/mm/2s2h/Enhancements/Equipment/InstantRecall.h b/mm/2s2h/Enhancements/Equipment/InstantRecall.h deleted file mode 100644 index 4dd58d4fc..000000000 --- a/mm/2s2h/Enhancements/Equipment/InstantRecall.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef EQUIPMENT_INSTAND_RECALL_H -#define EQUIPMENT_INSTAND_RECALL_H - -void RegisterInstantRecall(); - -#endif // EQUIPMENT_INSTAND_RECALL_H diff --git a/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.cpp b/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.cpp index 299748061..52c0f1064 100644 --- a/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.cpp +++ b/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.cpp @@ -1,9 +1,9 @@ #include #include "Enhancements/GameInteractor/GameInteractor.h" -#include "z64.h" -#include "src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" extern "C" { +#include "z64.h" +#include "src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" extern s16 sEquipState; extern s16 sEquipAnimTimer; } diff --git a/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.h b/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.h deleted file mode 100644 index 2c96b97b9..000000000 --- a/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef EQUIPMENT_SKIP_MAGIC_ARROW_EQUIP_H -#define EQUIPMENT_SKIP_MAGIC_ARROW_EQUIP_H - -void RegisterSkipMagicArrowEquip(); - -#endif // EQUIPMENT_SKIP_MAGIC_ARROW_EQUIP_H diff --git a/mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp b/mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp index f72031e86..acf93cda9 100644 --- a/mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp +++ b/mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp @@ -1,4 +1,3 @@ -#include "3DItemDrops.h" #include "libultraship/libultraship.h" #include "2s2h/Enhancements/GameInteractor/GameInteractor.h" diff --git a/mm/2s2h/Enhancements/Graphics/3DItemDrops.h b/mm/2s2h/Enhancements/Graphics/3DItemDrops.h deleted file mode 100644 index 2801aaac2..000000000 --- a/mm/2s2h/Enhancements/Graphics/3DItemDrops.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GRAPHICS_3D_ITEM_DROPS_H -#define GRAPHICS_3D_ITEM_DROPS_H - -void Register3DItemDrops(); - -#endif // GRAPHICS_3D_ITEM_DROPS_H diff --git a/mm/2s2h/Enhancements/Graphics/3DSClock.h b/mm/2s2h/Enhancements/Graphics/3DSClock.h deleted file mode 100644 index 8a7dc143e..000000000 --- a/mm/2s2h/Enhancements/Graphics/3DSClock.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MM3D_CLOCK_H -#define MM3D_CLOCK_H - -void Register3DSClock(); - -#endif // TEXT_BASED_CLOCK_H diff --git a/mm/2s2h/Enhancements/Graphics/DisableBlackBars.cpp b/mm/2s2h/Enhancements/Graphics/DisableBlackBars.cpp index f98b8e68f..c14532842 100644 --- a/mm/2s2h/Enhancements/Graphics/DisableBlackBars.cpp +++ b/mm/2s2h/Enhancements/Graphics/DisableBlackBars.cpp @@ -1,6 +1,5 @@ #include #include "Enhancements/GameInteractor/GameInteractor.h" -#include "DisableBlackBars.h" void RegisterDisableBlackBars() { REGISTER_VB_SHOULD(VB_DISABLE_LETTERBOX, { diff --git a/mm/2s2h/Enhancements/Graphics/DisableBlackBars.h b/mm/2s2h/Enhancements/Graphics/DisableBlackBars.h deleted file mode 100644 index fc5be3b3c..000000000 --- a/mm/2s2h/Enhancements/Graphics/DisableBlackBars.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GRAPHICS_DISABLE_BLACK_BARS_H -#define GRAPHICS_DISABLE_BLACK_BARS_H - -void RegisterDisableBlackBars(); - -#endif // GRAPHICS_DISABLE_BLACK_BARS_H diff --git a/mm/2s2h/Enhancements/Graphics/Graphics.h b/mm/2s2h/Enhancements/Graphics/Graphics.h new file mode 100644 index 000000000..917c6aa74 --- /dev/null +++ b/mm/2s2h/Enhancements/Graphics/Graphics.h @@ -0,0 +1,23 @@ +#ifndef GRAPHICS_H +#define GRAPHICS_H + +void Register3DItemDrops(); +void Register3DSClock(); +void RegisterDisableBlackBars(); +void MotionBlur_RenderMenuOptions(); +void RegisterPlayAsKafei(); +void RegisterTextBasedClock(); + +#ifdef __cplusplus +#include + +extern "C" { +#endif + +void MotionBlur_Override(u8* status, s32* alpha); + +#ifdef __cplusplus +}; +#endif + +#endif // GRAPHICS_H diff --git a/mm/2s2h/Enhancements/Graphics/MotionBlur.cpp b/mm/2s2h/Enhancements/Graphics/MotionBlur.cpp index d7afd78e1..0c4dc1c0a 100644 --- a/mm/2s2h/Enhancements/Graphics/MotionBlur.cpp +++ b/mm/2s2h/Enhancements/Graphics/MotionBlur.cpp @@ -1,4 +1,3 @@ -#include "MotionBlur.h" #include #include "2s2h/BenGui/UIWidgets.hpp" diff --git a/mm/2s2h/Enhancements/Graphics/MotionBlur.h b/mm/2s2h/Enhancements/Graphics/MotionBlur.h deleted file mode 100644 index 0719d0c17..000000000 --- a/mm/2s2h/Enhancements/Graphics/MotionBlur.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef MOTION_BLUR_H -#define MOTION_BLUR_H - -void MotionBlur_RenderMenuOptions(); - -#ifdef __cplusplus -#include - -extern "C" { -#endif - -void MotionBlur_Override(u8* status, s32* alpha); - -#ifdef __cplusplus -}; -#endif - -#endif // MOTION_BLUR_H diff --git a/mm/2s2h/Enhancements/Graphics/PlayAsKafei.cpp b/mm/2s2h/Enhancements/Graphics/PlayAsKafei.cpp index 9c69d6704..a00159c16 100644 --- a/mm/2s2h/Enhancements/Graphics/PlayAsKafei.cpp +++ b/mm/2s2h/Enhancements/Graphics/PlayAsKafei.cpp @@ -1,4 +1,3 @@ -#include "PlayAsKafei.h" #include "libultraship/libultraship.h" #include "2s2h/Enhancements/GameInteractor/GameInteractor.h" diff --git a/mm/2s2h/Enhancements/Graphics/PlayAsKafei.h b/mm/2s2h/Enhancements/Graphics/PlayAsKafei.h deleted file mode 100644 index 0a6cd18e0..000000000 --- a/mm/2s2h/Enhancements/Graphics/PlayAsKafei.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef GRAPHICS_PLAY_AS_KAFEI_H -#define GRAPHICS_PLAY_AS_KAFEI_H - -void RegisterPlayAsKafei(); -void UpdatePlayAsKafeiSkeletons(); -void UpdatePlayAsKafeiOther(); - -#endif // GRAPHICS_PLAY_AS_KAFEI_H diff --git a/mm/2s2h/Enhancements/Graphics/TextBasedClock.h b/mm/2s2h/Enhancements/Graphics/TextBasedClock.h deleted file mode 100644 index c85ba9450..000000000 --- a/mm/2s2h/Enhancements/Graphics/TextBasedClock.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TEXT_BASED_CLOCK_H -#define TEXT_BASED_CLOCK_H - -void RegisterTextBasedClock(); - -#endif // TEXT_BASED_CLOCK_H diff --git a/mm/2s2h/Enhancements/Masks/BlastMaskKeg.cpp b/mm/2s2h/Enhancements/Masks/BlastMaskKeg.cpp index b883822ec..ee8a87a83 100644 --- a/mm/2s2h/Enhancements/Masks/BlastMaskKeg.cpp +++ b/mm/2s2h/Enhancements/Masks/BlastMaskKeg.cpp @@ -1,10 +1,10 @@ #include #include "Enhancements/GameInteractor/GameInteractor.h" -#include "global.h" static uint32_t bombType; extern "C" { +#include "global.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" EquipSlot func_8082FDC4(void); } diff --git a/mm/2s2h/Enhancements/Masks/BlastMaskKeg.h b/mm/2s2h/Enhancements/Masks/BlastMaskKeg.h deleted file mode 100644 index a32a4726b..000000000 --- a/mm/2s2h/Enhancements/Masks/BlastMaskKeg.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef EQUIPMENT_BLAST_MASK_KEG_H -#define EQUIPMENT_BLAST_MASK_KEG_H - -void RegisterBlastMaskKeg(); - -#endif // EQUIPMENT_BLAST_MASK_KEG_H diff --git a/mm/2s2h/Enhancements/Masks/FastTransformation.h b/mm/2s2h/Enhancements/Masks/FastTransformation.h deleted file mode 100644 index 6820c3c9a..000000000 --- a/mm/2s2h/Enhancements/Masks/FastTransformation.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MASKS_FAST_TRANSFORMATION_H -#define MASKS_FAST_TRANSFORMATION_H - -void RegisterFastTransformation(); - -#endif // MASKS_FAST_TRANSFORMATION_H diff --git a/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.h b/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.h deleted file mode 100644 index ee5b87e4d..000000000 --- a/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MASKS_FD_ANYWHERE_H -#define MASKS_FD_ANYWHERE_H - -void RegisterFierceDeityAnywhere(); - -#endif // MASKS_FD_ANYWHERE_H diff --git a/mm/2s2h/Enhancements/Masks/Masks.h b/mm/2s2h/Enhancements/Masks/Masks.h new file mode 100644 index 000000000..f65949ef0 --- /dev/null +++ b/mm/2s2h/Enhancements/Masks/Masks.h @@ -0,0 +1,11 @@ +#ifndef MASKS_H +#define MASKS_H + +void RegisterBlastMaskKeg(); +void RegisterFastTransformation(); +void RegisterFierceDeityAnywhere(); +void RegisterNoBlastMaskCooldown(); +void RegisterPersistentMasks(); +void UpdatePersistentMasksState(); + +#endif // MASKS_H diff --git a/mm/2s2h/Enhancements/Masks/NoBlastMaskCooldown.h b/mm/2s2h/Enhancements/Masks/NoBlastMaskCooldown.h deleted file mode 100644 index ed2a85efc..000000000 --- a/mm/2s2h/Enhancements/Masks/NoBlastMaskCooldown.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef NO_BLAST_MASK_COOLDOWN_H -#define NO_BLAST_MASK_COOLDOWN_H - -void RegisterNoBlastMaskCooldown(); - -#endif // NO_BLAST_MASK_COOLDOWN_H diff --git a/mm/2s2h/Enhancements/Masks/PersistentMasks.h b/mm/2s2h/Enhancements/Masks/PersistentMasks.h deleted file mode 100644 index db441e7b8..000000000 --- a/mm/2s2h/Enhancements/Masks/PersistentMasks.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef MASKS_PERSISTENT_MASKS_H -#define MASKS_PERSISTENT_MASKS_H - -void RegisterPersistentMasks(); -void UpdatePersistentMasksState(); - -#endif // MASKS_PERSISTENT_MASKS_H diff --git a/mm/2s2h/Enhancements/Minigames/AlwaysWinDoggyRace.h b/mm/2s2h/Enhancements/Minigames/AlwaysWinDoggyRace.h deleted file mode 100644 index 90318122d..000000000 --- a/mm/2s2h/Enhancements/Minigames/AlwaysWinDoggyRace.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MINIGAMES_ALWAYS_WIN_DOGGY_RACE_H -#define MINIGAMES_ALWAYS_WIN_DOGGY_RACE_H - -void RegisterAlwaysWinDoggyRace(); - -#endif // MINIGAMES_ALWAYS_WIN_DOGGY_RACE_H diff --git a/mm/2s2h/Enhancements/Minigames/Minigames.h b/mm/2s2h/Enhancements/Minigames/Minigames.h new file mode 100644 index 000000000..f7b02c094 --- /dev/null +++ b/mm/2s2h/Enhancements/Minigames/Minigames.h @@ -0,0 +1,6 @@ +#ifndef MINIGAMES_H +#define MINIGAMES_H + +void RegisterAlwaysWinDoggyRace(); + +#endif // MINIGAMES_H diff --git a/mm/2s2h/Enhancements/Modes/Modes.h b/mm/2s2h/Enhancements/Modes/Modes.h new file mode 100644 index 000000000..f46466f1a --- /dev/null +++ b/mm/2s2h/Enhancements/Modes/Modes.h @@ -0,0 +1,6 @@ +#ifndef MODES_H +#define MODES_H + +void RegisterTimeMovesWhenYouMove(); + +#endif // MODES_H diff --git a/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.cpp b/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.cpp index 8c56f8b8c..0ed98c051 100644 --- a/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.cpp +++ b/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.cpp @@ -1,4 +1,3 @@ -#include "TimeMovesWhenYouMove.h" #include "libultraship/libultraship.h" #include "2s2h/Enhancements/GameInteractor/GameInteractor.h" diff --git a/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.h b/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.h deleted file mode 100644 index 15532cd21..000000000 --- a/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MODES_TIME_MOVES_WHEN_YOU_MOVE_H -#define MODES_TIME_MOVES_WHEN_YOU_MOVE_H - -void RegisterTimeMovesWhenYouMove(); - -#endif // MODES_TIME_MOVES_WHEN_YOU_MOVE_H diff --git a/mm/2s2h/Enhancements/Player/FastFlowerLaunch.cpp b/mm/2s2h/Enhancements/Player/FastFlowerLaunch.cpp index 50c2fe185..07bac7321 100644 --- a/mm/2s2h/Enhancements/Player/FastFlowerLaunch.cpp +++ b/mm/2s2h/Enhancements/Player/FastFlowerLaunch.cpp @@ -1,6 +1,5 @@ #include #include "Enhancements/GameInteractor/GameInteractor.h" -#include "spdlog/spdlog.h" extern "C" { #include "macros.h" diff --git a/mm/2s2h/Enhancements/Restorations/FlipHopVariable.h b/mm/2s2h/Enhancements/Restorations/FlipHopVariable.h deleted file mode 100644 index 570424213..000000000 --- a/mm/2s2h/Enhancements/Restorations/FlipHopVariable.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RESTORATIONS_FLIP_HOP_VARIABLE_H -#define RESTORATIONS_FLIP_HOP_VARIABLE_H - -void RegisterVariableFlipHop(); - -#endif // RESTORATIONS_FLIP_HOP_VARIABLE_H diff --git a/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.h b/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.h deleted file mode 100644 index 64747487f..000000000 --- a/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RESTORATIONS_POWER_CROUCH_STAB_H -#define RESTORATIONS_POWER_CROUCH_STAB_H - -void RegisterPowerCrouchStab(); - -#endif // RESTORATIONS_POWER_CROUCH_STAB_H diff --git a/mm/2s2h/Enhancements/Restorations/Restorations.h b/mm/2s2h/Enhancements/Restorations/Restorations.h index 8b2a722e6..667a3866d 100644 --- a/mm/2s2h/Enhancements/Restorations/Restorations.h +++ b/mm/2s2h/Enhancements/Restorations/Restorations.h @@ -1,6 +1,10 @@ #ifndef ENHANCEMENTS_RESTORATIONS_H #define ENHANCEMENTS_RESTORATIONS_H +void RegisterVariableFlipHop(); +void RegisterPowerCrouchStab(); +void RegisterSideRoll(); +void RegisterTatlISG(); void RegisterWoodfallMountainAppearance(); #endif // ENHANCEMENTS_RESTORATIONS_H diff --git a/mm/2s2h/Enhancements/Restorations/SideRoll.h b/mm/2s2h/Enhancements/Restorations/SideRoll.h deleted file mode 100644 index f0fe430e0..000000000 --- a/mm/2s2h/Enhancements/Restorations/SideRoll.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RESTORATIONS_SIDEROLL_H -#define RESTORATIONS_SIDEROLL_H - -void RegisterSideRoll(); - -#endif // RESTORATIONS_SIDEROLL_H diff --git a/mm/2s2h/Enhancements/Restorations/TatlISG.h b/mm/2s2h/Enhancements/Restorations/TatlISG.h deleted file mode 100644 index d1ed5afd6..000000000 --- a/mm/2s2h/Enhancements/Restorations/TatlISG.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RESTORATIONS_TATL_ISG_H -#define RESTORATIONS_TATL_ISG_H - -void RegisterTatlISG(); - -#endif // RESTORATIONS_TATL_ISG_H diff --git a/mm/2s2h/Enhancements/Songs/EnableSunsSong.h b/mm/2s2h/Enhancements/Songs/EnableSunsSong.h deleted file mode 100644 index 6ce2b5342..000000000 --- a/mm/2s2h/Enhancements/Songs/EnableSunsSong.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef SONGS_ENABLE_SUNS_SONG_H -#define SONGS_ENABLE_SUNS_SONG_H - -void RegisterEnableSunsSong(); - -#endif // SONGS_ENABLE_SUNS_SONG_H diff --git a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp b/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp index 35f27f4f2..f1c7ea2ca 100644 --- a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp +++ b/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp @@ -1,4 +1,3 @@ -#include "PauseOwlWarp.h" #include #include "Enhancements/GameInteractor/GameInteractor.h" diff --git a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.h b/mm/2s2h/Enhancements/Songs/PauseOwlWarp.h deleted file mode 100644 index b6adfeab9..000000000 --- a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef PAUSE_OWL_WARP_H -#define PAUSE_OWL_WARP_H - -#ifdef __cplusplus -extern "C" { -#endif - -void RegisterPauseOwlWarp(void); -bool PauseOwlWarp_IsOwlWarpEnabled(void); - -#ifdef __cplusplus -} -#endif - -#endif // PAUSE_OWL_WARP_H \ No newline at end of file diff --git a/mm/2s2h/Enhancements/Songs/Songs.h b/mm/2s2h/Enhancements/Songs/Songs.h new file mode 100644 index 000000000..22469f29e --- /dev/null +++ b/mm/2s2h/Enhancements/Songs/Songs.h @@ -0,0 +1,18 @@ +#ifndef SONGS_H +#define SONGS_H + +void RegisterEnableSunsSong(); +void RegisterZoraEggCount(); +void RegisterPauseOwlWarp(); + +#ifdef __cplusplus +extern "C" { +#endif + +bool PauseOwlWarp_IsOwlWarpEnabled(void); + +#ifdef __cplusplus +} +#endif + +#endif // SONGS_H diff --git a/mm/2s2h/Enhancements/Songs/ZoraEggCount.cpp b/mm/2s2h/Enhancements/Songs/ZoraEggCount.cpp index af03c56fe..f15354bfe 100644 --- a/mm/2s2h/Enhancements/Songs/ZoraEggCount.cpp +++ b/mm/2s2h/Enhancements/Songs/ZoraEggCount.cpp @@ -1,4 +1,3 @@ -#include "ZoraEggCount.h" #include #include "Enhancements/GameInteractor/GameInteractor.h" diff --git a/mm/2s2h/Enhancements/Songs/ZoraEggCount.h b/mm/2s2h/Enhancements/Songs/ZoraEggCount.h deleted file mode 100644 index 35ac5ed60..000000000 --- a/mm/2s2h/Enhancements/Songs/ZoraEggCount.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef VARIABLE_ZORA_EGG_COUNT_H -#define VARIABLE_ZORA_EGG_COUNT_H - -void RegisterZoraEggCount(); - -#endif // VARIABLE_ZORA_EGG_COUNT_H \ No newline at end of file diff --git a/mm/src/code/z_camera.c b/mm/src/code/z_camera.c index a42dcde2a..7b02ea02a 100644 --- a/mm/src/code/z_camera.c +++ b/mm/src/code/z_camera.c @@ -64,7 +64,7 @@ Vec3f D_801EDDE0; Vec3f D_801EDDF0; #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #include "2s2h/Enhancements/GameInteractor/GameInteractor.h" -#include "2s2h/Enhancements/Camera/FreeLook.h" +#include "2s2h/Enhancements/Camera/Camera.h" // Camera will reload its paramData. Usually that means setting the read-only data from what is stored in // CameraModeValue arrays. Although sometimes some read-write data is reset as well diff --git a/mm/src/code/z_play.c b/mm/src/code/z_play.c index 80492c22e..56f132219 100644 --- a/mm/src/code/z_play.c +++ b/mm/src/code/z_play.c @@ -37,7 +37,7 @@ u8 sMotionBlurStatus; #include "BenPort.h" #include "2s2h/Enhancements/GameInteractor/GameInteractor.h" #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" -#include "2s2h/Enhancements/Graphics/MotionBlur.h" +#include "2s2h/Enhancements/Graphics/Graphics.h" #include "2s2h/DeveloperTools/CollisionViewer.h" #include "2s2h/framebuffer_effects.h" #include diff --git a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_map.c b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_map.c index 9ae8cb101..dcb50ae76 100644 --- a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_map.c +++ b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_map.c @@ -13,7 +13,7 @@ #include "BenPort.h" -#include "2s2h/Enhancements/Songs/PauseOwlWarp.h" +#include "2s2h/Enhancements/Songs/Songs.h" // 2S2H [Port] (and line 26) don't do pointer math and access the list of digits directly. extern const char* sCounterTextures[]; diff --git a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c index 4bcb9ed18..2b7c35156 100644 --- a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c +++ b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c @@ -24,7 +24,7 @@ #include "2s2h/Enhancements/GameInteractor/GameInteractor.h" -#include "2s2h/Enhancements/Songs/PauseOwlWarp.h" +#include "2s2h/Enhancements/Songs/Songs.h" // Page Textures (Background of Page): // Broken up into multiple textures.