diff --git a/Makefile b/Makefile
index bb21f0a9c3..fa9bfc7b8b 100644
--- a/Makefile
+++ b/Makefile
@@ -150,6 +150,11 @@ $(BUILD_DIR)/%.s.o: %.s
 	@mkdir -p $(shell dirname $@)
 	$(AS) $(ASFLAGS) -o $@ $<
 
+# Data
+$(BUILD_DIR)/data/%.data.o: asm/data/%.data.s
+	@mkdir -p $(shell dirname $@)
+	$(AS) $(ASFLAGS) -o $@ $<
+
 # Images
 $(BUILD_DIR)/%.png.o: $(BUILD_DIR)/%.png
 	$(LD) -r -b binary -o $@ $<
diff --git a/asm/data/si.data.s b/asm/data/si.data.s
new file mode 100644
index 0000000000..0b258c962f
--- /dev/null
+++ b/asm/data/si.data.s
@@ -0,0 +1,15 @@
+.include "macro.inc"
+
+.section .data
+
+glabel ShakeCam1
+.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel ShakeCamX
+.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel gPlayerNpcPtr
+.word 0x802DB270, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, 0x802D5B10, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel D_802D9D50
+.word 0x00000043, 0x00000001, func_802D7BA4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0xFEFE00FF, 0x00000000, 0x00000000, 0x00000000
diff --git a/src/code_197F40.c b/src/code_197F40.c
index b4a16af1af..0cc624d125 100644
--- a/src/code_197F40.c
+++ b/src/code_197F40.c
@@ -1807,7 +1807,7 @@ ApiStatus func_8026D5A4(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus HPBarToHome(ScriptInstance *script, s32 isInitialCall) {
+ApiStatus HPBarToHome(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     ActorID actorID = get_variable(script, *args++);
     Actor* actor;
@@ -1830,7 +1830,7 @@ ApiStatus HPBarToHome(ScriptInstance *script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus HPBarToCurrent(ScriptInstance *script, s32 isInitialCall) {
+ApiStatus HPBarToCurrent(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     ActorID actorID = get_variable(script, *args++);
     Actor* actor;
@@ -1853,7 +1853,7 @@ ApiStatus HPBarToCurrent(ScriptInstance *script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_8026D8EC(ScriptInstance *script, s32 isInitialCall) {
+ApiStatus func_8026D8EC(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     ActorID actorID = get_variable(script, *args++);
 
@@ -1866,7 +1866,7 @@ ApiStatus func_8026D8EC(ScriptInstance *script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_8026D940(ScriptInstance *script, s32 isInitialCall) {
+ApiStatus func_8026D940(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     ActorID actorID = get_variable(script, *args++);
     Actor* actor;
@@ -1894,7 +1894,7 @@ ApiStatus func_8026D940(ScriptInstance *script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_8026DA94(ScriptInstance *script, s32 isInitialCall) {
+ApiStatus func_8026DA94(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     ActorID actorID = get_variable(script, *args++);
     Actor* actor;
diff --git a/tools/n64splat b/tools/n64splat
index 686be7cf19..150b75e52c 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 686be7cf19780b5dd619e0f51bb071f721b05b9a
+Subproject commit 150b75e52c30a48a32dde48c124cd4a8b87016a0
diff --git a/tools/splat.yaml b/tools/splat.yaml
index fa08fd955e..e6a9c3899f 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -266,7 +266,7 @@ segments:
     - [0xFBE10, c]
     - [0xfe0b0, c, code_fe0b0_len_5a0]
     - [0xFE650, .data, code_e79b0_len_1920]
-    - [0xFE660, bin]
+    - [0xFE660, data, si]
     - [0xFE730, .rodata, code_e79b0_len_1920]
   - [0xFE748, bin] # rodata chunk for above overlay; here to avoid the 0x10 alignment
   - type: code
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 25c7b7bf38..4020f96fef 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1880,6 +1880,7 @@ GetItemPower = 0x802D732C;
 ShowGotItem = 0x802D73A4;
 ShowEmote = 0x802D78A0;
 RemoveEffect = 0x802D7AE4;
+func_802D7BA4 = 0x802D7BA4;
 ShowSleepBubble = 0x802D8028;
 PlayEffect = 0x802D829C;
 SetSpriteShading = 0x802D9700;