mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-17 21:35:11 +00:00
Code Issues Projects Releases Wiki Activity

dont use asm-processor, use iconv for reencoding utf8 to eucjp

Browse source
This commit is contained in:
Dragorn421 2024-02-19 19:03:05 +01:00
parent 155ad4f59f
commit 1716be6696
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -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/jpegutils.o: CC := $(CC_OLD)
$(BUILD_DIR)/src/code/jpegdecoder.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) -- # For using asm_processor on some files:
$(BUILD_DIR)/src/code/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- #$(BUILD_DIR)/.../%.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) --
$(BUILD_DIR)/%.o: CC := tools/reencode.sh $(CC)
$(BUILD_DIR)/assets/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
else else
$(BUILD_DIR)/src/libultra/libc/ll.o: OPTFLAGS := -Ofast $(BUILD_DIR)/src/libultra/libc/ll.o: OPTFLAGS := -Ofast
$(BUILD_DIR)/src/%.o: CC := $(CC) -fexec-charset=euc-jp $(BUILD_DIR)/src/%.o: CC := $(CC) -fexec-charset=euc-jp

1
src/code/z_collision_check.c
View file

@ -1408,6 +1408,7 @@ void CollisionCheck_NoBlood(PlayState* play, Collider* collider, Vec3f* v) {
* Used by collider types HIT0 and HIT8. * Used by collider types HIT0 and HIT8.
*/ */
void CollisionCheck_BlueBlood(PlayState* play, Collider* collider, Vec3f* v) { void CollisionCheck_BlueBlood(PlayState* play, Collider* collider, Vec3f* v) {
static s32 pad;
static EffectSparkInit sparkInit; static EffectSparkInit sparkInit;
s32 effectIndex; s32 effectIndex;

11
tools/reencode.sh Executable file
View file

@ -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