4 files changed, 13 insertions, 11 deletions
diff --git a/soh/include/functions.h b/soh/include/functions.h
index a1eaa3286..dc6d9b038 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -20,11 +20,11 @@ extern "C"
 #endif
 
 f32 fabsf(f32 f);
-#pragma intrinsic(fabsf)
+//#pragma intrinsic(fabsf)
 f32 sqrtf(f32 f);
-#pragma intrinsic(sqrtf)
+//#pragma intrinsic(sqrtf)
 f64 sqrt(f64 d);
-#pragma intrinsic(sqrt)
+//#pragma intrinsic(sqrt)
 
 void gSPSegment(void* value, int segNum, uintptr_t target);
 void gDPSetTextureImage(Gfx* pkt, u32 f, u32 s, u32 w, uintptr_t i);
@@ -2419,8 +2419,6 @@ void Opening_Destroy(GameState* thisx);
 void FileChoose_Init(GameState* thisx);
 void FileChoose_Destroy(GameState* thisx);
 
-char* SetQuote();
-
 void Heaps_Alloc(void);
 void Heaps_Free(void);
 
diff --git a/soh/include/libc/stddef.h b/soh/include/libc/stddef.h
index e5fbe2d22..8f57cf4f6 100644
--- a/soh/include/libc/stddef.h
+++ b/soh/include/libc/stddef.h
@@ -1,11 +1,13 @@
 #ifndef STDDEF_H
 #define STDDEF_H
 
-#ifndef __cplusplus
-#define NULL ((void*)0)
-#else
-#define NULL nullptr
-#endif
+#include <stddef.h>
+
+//#ifndef __cplusplus
+//#define NULL ((void*)0)
+//#else
+//#define NULL nullptr
+//#endif
 
 #if 0
 #define size_t unsigned long
diff --git a/soh/include/z64map_mark.h b/soh/include/z64map_mark.h
index d86219784..f44eea0d3 100644
--- a/soh/include/z64map_mark.h
+++ b/soh/include/z64map_mark.h
@@ -20,6 +20,7 @@ typedef struct {
 
 typedef MapMarkIconData MapMarkData[3]; // size = 0x72
 
-extern MapMarkData* gMapMarkDataTable[];
+extern MapMarkData* gMapMarkDataTableVanilla[];
+extern MapMarkData* gMapMarkDataTableMq[];
 
 #endif
diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index 37871611e..af32f2f35 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -175,6 +175,7 @@ typedef struct {
     /* 0x1420 */ s16 worldMapArea;
     /* 0x1422 */ s16 sunsSongState; // controls the effects of suns song
     /* 0x1424 */ s16 healthAccumulator;
+    uint32_t isMasterQuest;
     RandoSetting randoSettings[300];
     ItemLocationRando itemLocations[RC_MAX];
     HintLocationRando hintLocations[50];