Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity

soh/include/global.h

@@ -6,7 +6,7 @@
 #include "macros.h"
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/gameconsole.h"
-#include "Cvar.h"
+#include <libultraship/Cvar.h>
 
 
 

soh/include/macros.h

@@ -1,7 +1,7 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include "endianness.h"
+#include <libultraship/endianness.h>
 
 #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
 #define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0]))

soh/include/z64.h

@@ -26,7 +26,7 @@
 #include "z64interface.h"
 #include "sequence.h"
 #include "sfx.h"
-#include "color.h"
+#include <libultraship/color.h>
 #include "ichain.h"
 #include "regs.h"
 

soh/include/z64audio.h

@@ -1,7 +1,7 @@
 #ifndef Z64_AUDIO_H
 #define Z64_AUDIO_H
 
-#include "endianness.h"
+#include <libultraship/endianness.h>
 
 #define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))
 
@@ -815,7 +815,7 @@ typedef struct {
     /* 0x0E */ u8 ttl;        // duration after which the DMA can be discarded
 } SampleDma; // size = 0x10
 
-#include <PR/ultra64/abi.h>
+#include <ultra64/abi.h>
 
 typedef struct {
     /* 0x0000 */ char unk_0000;
@@ -1122,4 +1122,4 @@ float Audio_GetGameVolume(int player_id);
 #ifdef __cplusplus
 }
 #endif
-#endif
+#endif

soh/include/z64effect.h

@@ -1,7 +1,7 @@
 #ifndef Z64EFFECT_H
 #define Z64EFFECT_H
 
-#include "color.h"
+#include <libultraship/color.h>
 
 struct GraphicsContext;
 struct GlobalContext;

soh/include/z64light.h

@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "ultra64/gbi.h"
 #include "z64math.h"
-#include "color.h"
+#include <libultraship/color.h>
 
 typedef struct {
     /* 0x0 */ s16 x;

soh/include/z64transition.h

@@ -2,7 +2,7 @@
 #define Z64TRANSITION_H
 
 #include "ultra64.h"
-#include "color.h"
+#include <libultraship/color.h>
 
 typedef struct {
     f32 unk_0;