diff --git a/asm/sdata2/J3DCluster.s b/asm/sdata2/J3DCluster.s
index 831d09b871a..bdf237d6ce0 100644
--- a/asm/sdata2/J3DCluster.s
+++ b/asm/sdata2/J3DCluster.s
@@ -7,7 +7,7 @@ lbl_80456470:
 
 .global lbl_80456474
 lbl_80456474:
-.incbin "baserom.dol", 0x3D52D4, 0x8
+.incbin "baserom.dol", 0x3D52D4, 0x4
 
 .global lbl_80456478
 lbl_80456478:
diff --git a/asm/sdata2/Z2Creature.s b/asm/sdata2/Z2Creature.s
index cd16dfdcf37..9ee174bbf61 100644
--- a/asm/sdata2/Z2Creature.s
+++ b/asm/sdata2/Z2Creature.s
@@ -11,7 +11,7 @@ lbl_80455BDC:
 
 .global lbl_80455BE0
 lbl_80455BE0:
-.incbin "baserom.dol", 0x3D4A40, 0x8
+.incbin "baserom.dol", 0x3D4A40, 0x4
 
 .global lbl_80455BE4
 lbl_80455BE4:
diff --git a/asm/sdata2/Z2SoundObjMgr.s b/asm/sdata2/Z2SoundObjMgr.s
index 253e8fba127..e2a176dd82b 100644
--- a/asm/sdata2/Z2SoundObjMgr.s
+++ b/asm/sdata2/Z2SoundObjMgr.s
@@ -3,7 +3,7 @@
 
 .global lbl_80455B80
 lbl_80455B80:
-.incbin "baserom.dol", 0x3D49E0, 0x8
+.incbin "baserom.dol", 0x3D49E0, 0x4
 
 .global lbl_80455B84
 lbl_80455B84:
@@ -35,7 +35,7 @@ lbl_80455B9C:
 
 .global lbl_80455BA0
 lbl_80455BA0:
-.incbin "baserom.dol", 0x3D4A00, 0x8
+.incbin "baserom.dol", 0x3D4A00, 0x4
 
 .global lbl_80455BA4
 lbl_80455BA4:
diff --git a/obj_files.mk b/obj_files.mk
index dce10887a94..e29cc5cf800 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -594,9 +594,11 @@ TEXT_O_FILES := 						            \
             $(BUILD_DIR)/asm/JStage/JSGLight.o \
             $(BUILD_DIR)/asm/sdata2/JSGObject.o \
             $(BUILD_DIR)/asm/JStage/JSGObject.o \
+            $(BUILD_DIR)/asm/sdata2/ctb-data.o \
             $(BUILD_DIR)/asm/JStage/JSGSystem.o \
             $(BUILD_DIR)/asm/JStudio/ctb.o \
             $(BUILD_DIR)/asm/sdata2/functionvalue.o \
+            $(BUILD_DIR)/asm/sdata2/fvb-data.o \
             $(BUILD_DIR)/libs/JSystem/JStudio/functionvalue.o \
             $(BUILD_DIR)/asm/rodata/rodata_functionvalue.o \
             $(BUILD_DIR)/asm/JStudio/functionvalue.o \
@@ -607,6 +609,7 @@ TEXT_O_FILES := 						            \
             $(BUILD_DIR)/asm/rodata/rodata_jstudio-control.o \
             $(BUILD_DIR)/asm/sdata2/jstudio-control.o \
             $(BUILD_DIR)/asm/JStudio/jstudio-control.o \
+            $(BUILD_DIR)/asm/sdata2/jstudio-data.o \
             $(BUILD_DIR)/asm/sdata2/jstudio-math.o \
             $(BUILD_DIR)/asm/JStudio/jstudio-math.o \
             $(BUILD_DIR)/asm/rodata/rodata_jstudio-object.o \
@@ -616,6 +619,7 @@ TEXT_O_FILES := 						            \
             $(BUILD_DIR)/asm/rodata/rodata_stb-data.o \
             $(BUILD_DIR)/asm/sdata2/stb.o \
             $(BUILD_DIR)/libs/JSystem/JStudio/stb.o \
+            $(BUILD_DIR)/asm/sdata2/stb-data.o \
             $(BUILD_DIR)/asm/JStudio/stb-data-parse.o \
             $(BUILD_DIR)/asm/rodata/rodata_control.o \
             $(BUILD_DIR)/asm/JStudio_JStage/control.o \
@@ -735,6 +739,7 @@ TEXT_O_FILES := 						            \
             $(BUILD_DIR)/libs/JSystem/JAudio2/JAUClusterSound.o \
             $(BUILD_DIR)/asm/sdata2/JAUInitializer.o \
             $(BUILD_DIR)/asm/JAudio2/JAUInitializer.o \
+            $(BUILD_DIR)/asm/sdata2/data.o \
             $(BUILD_DIR)/asm/rodata/rodata_JAUSectionHeap.o \
             $(BUILD_DIR)/asm/JAudio2/JAUSectionHeap.o \
             $(BUILD_DIR)/asm/JAudio2/JAUSeqCollection.o \
@@ -1149,11 +1154,6 @@ SBSS_O_FILES :=                                     \
     $(BUILD_DIR)/asm/sbss.o
 
 SDATA2_O_FILES :=  \
-            $(BUILD_DIR)/asm/sdata2/ctb-data.o \
-            $(BUILD_DIR)/asm/sdata2/fvb-data.o \
-            $(BUILD_DIR)/asm/sdata2/jstudio-data.o \
-            $(BUILD_DIR)/asm/sdata2/stb-data.o \
-            $(BUILD_DIR)/asm/sdata2/data.o \
             $(BUILD_DIR)/asm/sdata2/ansi_fp.o \
             $(BUILD_DIR)/asm/sdata2/mbstring.o \
             $(BUILD_DIR)/asm/sdata2/printf.o \