diff --git a/Makefile b/Makefile
index 34e198cb3b..32ad427f46 100644
--- a/Makefile
+++ b/Makefile
@@ -308,11 +308,11 @@ $(BUILD_DIR)/src/libultra/rmon/%.o: CC := $(CC_OLD)
 $(BUILD_DIR)/src/code/jpegutils.o: CC := $(CC_OLD)
 $(BUILD_DIR)/src/code/jpegdecoder.o: CC := $(CC_OLD)
 
-$(BUILD_DIR)/src/boot/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
-$(BUILD_DIR)/src/code/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
-$(BUILD_DIR)/src/overlays/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
+# For using asm_processor on some files:
+#$(BUILD_DIR)/.../%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
+
+$(BUILD_DIR)/%.o: CC := tools/reencode.sh $(CC)
 
-$(BUILD_DIR)/assets/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
 else
 $(BUILD_DIR)/src/libultra/libc/ll.o: OPTFLAGS := -Ofast
 $(BUILD_DIR)/src/%.o: CC := $(CC) -fexec-charset=euc-jp
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 57510f3c48..33cd4b3d97 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -1408,6 +1408,7 @@ void CollisionCheck_NoBlood(PlayState* play, Collider* collider, Vec3f* v) {
  * Used by collider types HIT0 and HIT8.
  */
 void CollisionCheck_BlueBlood(PlayState* play, Collider* collider, Vec3f* v) {
+    static s32 pad;
     static EffectSparkInit sparkInit;
     s32 effectIndex;
 
diff --git a/tools/reencode.sh b/tools/reencode.sh
new file mode 100755
index 0000000000..2bfd6c7db3
--- /dev/null
+++ b/tools/reencode.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+srcfile="${@: -1}"
+
+tempfile=`mktemp --tmpdir oot_XXXXXXXX.c`
+
+iconv -f UTF-8 -t EUC-JP -o "$tempfile" "$srcfile"
+
+"${@:1:$# - 1}" -I `dirname $srcfile` $tempfile