From e7b3421feff0479ea33865e0634868f43fa2aa7a Mon Sep 17 00:00:00 2001
From: headshot2017 <nou@jm>
Date: Wed, 1 Feb 2023 22:29:02 -0400
Subject: [PATCH] libsm64.h must be portable

---
 src/libsm64.c | 1 +
 src/libsm64.h | 4 ----
 test/main.cpp | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/libsm64.c b/src/libsm64.c
index 1def575..87cd9ad 100644
--- a/src/libsm64.c
+++ b/src/libsm64.c
@@ -14,6 +14,7 @@
 #include "decomp/include/PR/os_cont.h"
 #include "decomp/engine/math_util.h"
 #include "decomp/include/sm64.h"
+#include "decomp/include/seq_ids.h"
 #include "decomp/shim.h"
 #include "decomp/memory.h"
 #include "decomp/global_state.h"
diff --git a/src/libsm64.h b/src/libsm64.h
index c2f81ba..d6770a6 100644
--- a/src/libsm64.h
+++ b/src/libsm64.h
@@ -5,10 +5,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "decomp/include/mario_animation_ids.h"
-#include "decomp/include/audio_defines.h"
-#include "decomp/include/seq_ids.h"
-
 #ifdef _WIN32
     #ifdef SM64_LIB_EXPORT
         #define SM64_LIB_FN __declspec(dllexport)
diff --git a/test/main.cpp b/test/main.cpp
index 687956b..79a4b4d 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -115,7 +115,7 @@ int main( void )
 
     audio_init();
 
-    sm64_play_music(0, SEQ_LEVEL_WATER | SEQ_VARIATION, 0);
+    sm64_play_music(0, 0x05 | 0x80, 0); // from decomp/include/seq_ids.h: SEQ_LEVEL_WATER | SEQ_VARIATION
 
     do
     {