summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/c_keyframe.h1
-rw-r--r--include/fault.h2
-rw-r--r--include/segment_symbols.h2
-rw-r--r--include/tables/dmatables/dmadata_table_jp.h2
4 files changed, 6 insertions, 1 deletions
diff --git a/include/c_keyframe.h b/include/c_keyframe.h
index 26a00c7..7226579 100644
--- a/include/c_keyframe.h
+++ b/include/c_keyframe.h
@@ -3,6 +3,7 @@
#include "ultra64.h"
#include "z64math.h"
+#include "unk.h"
struct Game_Play;
diff --git a/include/fault.h b/include/fault.h
index 6cd6e30..0e33987 100644
--- a/include/fault.h
+++ b/include/fault.h
@@ -28,6 +28,8 @@
#define FAULT_ESC '\x1A'
#define FAULT_COLOR(n) "\x1A" FAULT_COLOR_EXPAND_AND_STRINGIFY(FAULT_COLOR_ ## n)
+// Address at the end of "non-expansion" memory space
+#define FAULT_FB_ADDRESS (void*)((PHYS_TO_K0(0x400000) - SCREEN_HEIGHT * SCREEN_WIDTH * sizeof(u16)))
typedef void (*FaultClientCallback)(void*, void*);
diff --git a/include/segment_symbols.h b/include/segment_symbols.h
index 544c1b7..7d7cbc1 100644
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@@ -97,6 +97,8 @@ DECLARE_SEGMENT(catalog_ovl);
DECLARE_SEGMENT(ac_set_ovl_insect);
DECLARE_SEGMENT(ac_set_ovl_gyoei);
+DECLARE_SEGMENT(locerrmsg);
+
DECLARE_SEGMENT(segment_00A58000);
DECLARE_SEGMENT(segment_00E02000);
diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h
index d66685b..76aa51a 100644
--- a/include/tables/dmatables/dmadata_table_jp.h
+++ b/include/tables/dmatables/dmadata_table_jp.h
@@ -1854,7 +1854,7 @@ DEFINE_DMA_ENTRY(segment_009F5000, "segment_009F5000")
DEFINE_DMA_ENTRY(segment_00A00000, "segment_00A00000")
DEFINE_DMA_ENTRY(segment_00A0B000, "segment_00A0B000")
DEFINE_DMA_ENTRY(segment_00A16000, "segment_00A16000")
-DEFINE_DMA_ENTRY(segment_00A21000, "segment_00A21000")
+DEFINE_DMA_ENTRY(locerrmsg, "locerrmsg")
DEFINE_DMA_ENTRY(gameplay_keep, "gameplay_keep")
DEFINE_DMA_ENTRY(segment_00A30000, "segment_00A30000")
DEFINE_DMA_ENTRY(segment_00A40000, "segment_00A40000")