summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
authorbriaguya <70942617+briaguya-ai@users.noreply.github.com>2022-11-14 05:22:34 -0500
committerGitHub <noreply@github.com>2022-11-14 11:22:34 +0100
commit3914781ebfd5cb22717cc207cb3d37d8754d0eb7 (patch)
tree2e412b87e66b1deef47bef242e7189a200cea0ff /soh/src/code
parent9eb29ed81cb497a6a216811255f8af7daf3f8bd8 (diff)
Import libultraship as a submodule (#1943)
Co-authored-by: briaguya <briaguya> Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: David Chavez <davi@dcvz.io>
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/audio_playback.c2
-rw-r--r--soh/src/code/audio_synthesis.c2
-rw-r--r--soh/src/code/code_800F9280.c2
-rw-r--r--soh/src/code/main.c2
-rw-r--r--soh/src/code/z_play.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/soh/src/code/audio_playback.c b/soh/src/code/audio_playback.c
index 2c7ff425d..5b19796c8 100644
--- a/soh/src/code/audio_playback.c
+++ b/soh/src/code/audio_playback.c
@@ -1,5 +1,5 @@
#include "global.h"
-#include <libultraship/Cvar.h>
+#include <Cvar.h>
extern bool gUseLegacySD;
diff --git a/soh/src/code/audio_synthesis.c b/soh/src/code/audio_synthesis.c
index 72dbb25ec..5b7878630 100644
--- a/soh/src/code/audio_synthesis.c
+++ b/soh/src/code/audio_synthesis.c
@@ -1,6 +1,6 @@
#include "ultra64.h"
#include "global.h"
-#include <libultraship/mixer.h>
+#include <mixer.h>
#define DEFAULT_LEN_1CH 0x1A0
#define DEFAULT_LEN_2CH 0x340
diff --git a/soh/src/code/code_800F9280.c b/soh/src/code/code_800F9280.c
index 66d3cec31..086752a1c 100644
--- a/soh/src/code/code_800F9280.c
+++ b/soh/src/code/code_800F9280.c
@@ -1,7 +1,7 @@
#include "ultra64.h"
#include "global.h"
#include <ultra64/abi.h>
-#include <libultraship/mixer.h>
+#include <mixer.h>
typedef struct {
u8 unk_0;
diff --git a/soh/src/code/main.c b/soh/src/code/main.c
index 5ad123a26..d933f6923 100644
--- a/soh/src/code/main.c
+++ b/soh/src/code/main.c
@@ -3,7 +3,7 @@
#include <soh/Enhancements/bootcommands.h>
#include "soh/OTRGlobals.h"
-#include <libultraship/CrashHandler.h>
+#include <CrashHandler.h>
#include "soh/CrashHandlerExp.h"
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index a1d0a1722..8bc51042e 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -4,7 +4,7 @@
#include <string.h>
#include "soh/Enhancements/gameconsole.h"
-#include <libultraship/ImGuiImpl.h>
+#include <ImGuiImpl.h>
#include "soh/frame_interpolation.h"
#include "soh/Enhancements/debugconsole.h"
#include <overlays/actors/ovl_En_Niw/z_en_niw.h>