diff --git a/Makefile b/Makefile
index 9a365b3ca..573785ea6 100644
--- a/Makefile
+++ b/Makefile
@@ -219,7 +219,7 @@ $(BUILD_DIR)/%.mio0.o: $(BUILD_DIR)/%.mio0.s
 	$(AS) $(ASFLAGS) -o $@ $<
 
 $(BUILD_DIR)/%.mio0.s: $(BUILD_DIR)/%.mio0
-	printf ".section .data\n\n.incbin \"$<\"\n" > $@
+	printf ".section .data\n\n.balign 4\n\n.incbin \"$<\"\n" > $@
 
 $(BUILD_DIR)/src/crash_screen.o: src/crash_screen.c
 	$(N64GRAPHICS) -i $(BUILD_DIR)/textures/crash_screen/crash_screen_font.ia1.inc.c -g textures/crash_screen/crash_screen_font.ia1.png -f ia1 -s u8
@@ -446,7 +446,7 @@ $(BUILD_DIR)/src/startup_logo.inc.mio0.o: src/startup_logo.inc.c
 	$(LD) -t -e 0 -Ttext=06000000 -Map $(BUILD_DIR)/src/startup_logo.inc.elf.map -o $(BUILD_DIR)/src/startup_logo.inc.elf $(BUILD_DIR)/src/startup_logo.inc.o --no-check-sections
 	$(V)$(EXTRACT_DATA_FOR_MIO) $(BUILD_DIR)/src/startup_logo.inc.elf $(BUILD_DIR)/src/startup_logo.inc.bin
 	$(MIO0TOOL) -c $(BUILD_DIR)/src/startup_logo.inc.bin $(BUILD_DIR)/src/startup_logo.inc.mio0
-	printf ".include \"macros.inc\"\n\n.data\n\n.align 2, 0x00\n\n.balign 4\n\nglabel startup_logo\n\n.incbin \"build/us/src/startup_logo.inc.mio0\"\n" > build/us/src/startup_logo.inc.mio0.s
+	printf ".include \"macros.inc\"\n\n.data\n\n\n\n.balign 4\n\nglabel startup_logo\n\n.incbin \"build/us/src/startup_logo.inc.mio0\"\n" > build/us/src/startup_logo.inc.mio0.s
 	$(AS) $(ASFLAGS) -o $(BUILD_DIR)/src/startup_logo.inc.mio0.o $(BUILD_DIR)/src/startup_logo.inc.mio0.s
 
 # trophy_model.inc.c
@@ -454,9 +454,8 @@ $(BUILD_DIR)/src/startup_logo.inc.mio0.o: src/startup_logo.inc.c
 $(BUILD_DIR)/src/trophy_model.inc.mio0.o: src/trophy_model.inc.c
 	$(LD) -t -e 0 -Ttext=0B000000 -Map $(BUILD_DIR)/src/trophy_model.inc.elf.map -o $(BUILD_DIR)/src/trophy_model.inc.elf $(BUILD_DIR)/src/trophy_model.inc.o --no-check-sections
 	$(V)$(EXTRACT_DATA_FOR_MIO) $(BUILD_DIR)/src/trophy_model.inc.elf $(BUILD_DIR)/src/trophy_model.inc.bin
-	#$(REMOVE_BYTES) $(BUILD_DIR)/src/trophy_model.inc.bin 8
 	$(MIO0TOOL) -c $(BUILD_DIR)/src/trophy_model.inc.bin $(BUILD_DIR)/src/trophy_model.inc.mio0
-	printf ".include \"macros.inc\"\n\n.data\n\n.align 2, 0x00\n\nglabel trophy_model\n\n.incbin \"build/us/src/trophy_model.inc.mio0\"\n" > build/us/src/trophy_model.inc.mio0.s
+	printf ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel trophy_model\n\n.incbin \"build/us/src/trophy_model.inc.mio0\"\n" > build/us/src/trophy_model.inc.mio0.s
 	$(AS) $(ASFLAGS) -o $(BUILD_DIR)/src/trophy_model.inc.mio0.o $(BUILD_DIR)/src/trophy_model.inc.mio0.s
 
 $(BUILD_DIR)/$(TARGET).elf: $(O_FILES) $(COURSE_MIO0_OBJ_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/src/startup_logo.inc.mio0.o $(BUILD_DIR)/src/trophy_model.inc.mio0.o $(LD_COURSE_VERTEX_DEPENDENCIES) undefined_syms.txt
diff --git a/permuter_settings.toml b/permuter_settings.toml
new file mode 100644
index 000000000..13f3d6c64
--- /dev/null
+++ b/permuter_settings.toml
@@ -0,0 +1,5 @@
+# Optional configuration file for import.py. Put it in the root or in tools/
+# of the repo you are importing from.
+
+[decompme.compilers]
+"tools/ido5.3_recomp/cc" = "ido5.3"
diff --git a/src/code_80281FA0.c b/src/code_80281FA0.c
index 60002ea80..5908ca386 100644
--- a/src/code_80281FA0.c
+++ b/src/code_80281FA0.c
@@ -533,22 +533,17 @@ extern s32 D_80287818;
 extern s32 D_80287998;
 
 s32 func_80282D90(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
-    s32 sp24;
-    s32 sp28;
-    s32 temp_a1;
+    s32 res;
 
     func_802832C4(&func_80282434, arg0, 0, 0);
     func_80282C40(&D_80287818, arg1, arg3);
-    
-        func_80282C40(&D_80287998, arg2, arg3);
+    func_80282C40(&D_80287998, arg2, arg3);
 
-        do { 
-            temp_a1 = arg0 + 0x18;
-            sp24 = temp_a1;
-        } while (0);
+    if (0) {}; // debug stub?
 
-        // Needed for matching including the above while loop.
-        sp28 = func_802828C8(arg0 + 0xC, temp_a1, &D_80287818, &D_80287B1C, &D_80287B18); return func_802828C8(arg0, temp_a1, &D_80287998, &D_80287B1C, &D_80287B18) | sp28;
+    res = func_802828C8(arg0 + 0xC, arg0 + 0x18, &D_80287818, &D_80287B1C, &D_80287B18) | 
+          func_802828C8(arg0, arg0 + 0x18, &D_80287998, &D_80287B1C, &D_80287B18);
+    return res;
 }
 
 void func_80282E58(s32 arg0, s32 arg1, s32 arg2) {