summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEblo <7004497+Eblo@users.noreply.github.com>2025-04-15 16:16:28 -0400
committerGitHub <noreply@github.com>2025-04-15 16:16:28 -0400
commit3dc8dab68eb8993e1736b0af40b5ce04aaf84edf (patch)
tree87ec897bca53c5290ef9e9214920257fac4e39c6
parente9b96ccfb088f288c39a094fbc38a5925f9a65e9 (diff)
Cleanup includes not in initial pass (#1121)
-rw-r--r--mm/2s2h/Enhancements/DifficultyOptions/HyperEnemies.cpp2
-rw-r--r--mm/2s2h/Rando/ActorBehavior/EnInvadepoh.cpp1
-rw-r--r--mm/2s2h/Rando/ActorBehavior/EnNb.cpp1
-rw-r--r--mm/2s2h/Rando/ActorBehavior/EnOt.cpp1
-rw-r--r--mm/2s2h/Rando/ActorBehavior/EnTakaraya.cpp1
-rw-r--r--mm/2s2h/Rando/ActorBehavior/ItemGetBehavior.cpp1
6 files changed, 1 insertions, 6 deletions
diff --git a/mm/2s2h/Enhancements/DifficultyOptions/HyperEnemies.cpp b/mm/2s2h/Enhancements/DifficultyOptions/HyperEnemies.cpp
index 0f3c090bc..c4748b2cc 100644
--- a/mm/2s2h/Enhancements/DifficultyOptions/HyperEnemies.cpp
+++ b/mm/2s2h/Enhancements/DifficultyOptions/HyperEnemies.cpp
@@ -1,4 +1,4 @@
-#include <libultraship/bridge.h>
+#include "public/bridge/consolevariablebridge.h"
#include "2s2h/GameInteractor/GameInteractor.h"
#include "2s2h/ShipInit.hpp"
diff --git a/mm/2s2h/Rando/ActorBehavior/EnInvadepoh.cpp b/mm/2s2h/Rando/ActorBehavior/EnInvadepoh.cpp
index 91b11b7ba..9bda5ccd4 100644
--- a/mm/2s2h/Rando/ActorBehavior/EnInvadepoh.cpp
+++ b/mm/2s2h/Rando/ActorBehavior/EnInvadepoh.cpp
@@ -1,5 +1,4 @@
#include "ActorBehavior.h"
-#include <libultraship/libultraship.h>
void Rando::ActorBehavior::InitEnInvadepohBehavior() {
// This is the same block found for non-scripted actors in OfferGetItem.cpp, but without Player_TalkWithPlayer().
diff --git a/mm/2s2h/Rando/ActorBehavior/EnNb.cpp b/mm/2s2h/Rando/ActorBehavior/EnNb.cpp
index c144de382..f3797b083 100644
--- a/mm/2s2h/Rando/ActorBehavior/EnNb.cpp
+++ b/mm/2s2h/Rando/ActorBehavior/EnNb.cpp
@@ -1,5 +1,4 @@
#include "ActorBehavior.h"
-#include <libultraship/libultraship.h>
extern "C" {
#include "variables.h"
diff --git a/mm/2s2h/Rando/ActorBehavior/EnOt.cpp b/mm/2s2h/Rando/ActorBehavior/EnOt.cpp
index 87a9953de..a9fae9024 100644
--- a/mm/2s2h/Rando/ActorBehavior/EnOt.cpp
+++ b/mm/2s2h/Rando/ActorBehavior/EnOt.cpp
@@ -1,5 +1,4 @@
#include "ActorBehavior.h"
-#include <libultraship/libultraship.h>
extern "C" {
#include "variables.h"
diff --git a/mm/2s2h/Rando/ActorBehavior/EnTakaraya.cpp b/mm/2s2h/Rando/ActorBehavior/EnTakaraya.cpp
index 3507ad585..6020bd40b 100644
--- a/mm/2s2h/Rando/ActorBehavior/EnTakaraya.cpp
+++ b/mm/2s2h/Rando/ActorBehavior/EnTakaraya.cpp
@@ -1,5 +1,4 @@
#include "ActorBehavior.h"
-#include <libultraship/libultraship.h>
extern "C" {
#include "variables.h"
diff --git a/mm/2s2h/Rando/ActorBehavior/ItemGetBehavior.cpp b/mm/2s2h/Rando/ActorBehavior/ItemGetBehavior.cpp
index 3114691bf..3a6a16f57 100644
--- a/mm/2s2h/Rando/ActorBehavior/ItemGetBehavior.cpp
+++ b/mm/2s2h/Rando/ActorBehavior/ItemGetBehavior.cpp
@@ -1,5 +1,4 @@
#include "ActorBehavior.h"
-#include <libultraship/libultraship.h>
extern "C" {
#include "overlays/actors/ovl_En_Dno/z_en_dno.h"