From 684d80aa076088ee018d963004539c9ee5330403 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 11 Jul 2020 16:12:45 -0400 Subject: Update asmdiff.sh script in CONTRIBUTING.md --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff323116..f36b82d0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -96,11 +96,11 @@ Your attempt was incorrect. Don't be discouraged, this is all part of the proces OBJDUMP_ARCH="${OBJDUMP_ARCH:-armv5te}" OBJDUMP_MODE="${OBJDUMP_MODE:-force-thumb}" -OBJDUMP_VMA="${OBJDUMP_VMA:-0x02000000}" -OBJDUMP="arm-none-eabi-objdump -Drz -bbinary -m${OBJDUMP_ARCH} -M${OBJDUMP_MODE}" +OBJDUMP_VMA=0x02000000 +OBJDUMP="arm-none-eabi-objdump -Drz -bbinary -m${OBJDUMP_ARCH} -M${OBJDUMP_MODE} --adjust-vma=$((OBJDUMP_VMA))" OPTIONS="--start-address=$(($1 + OBJDUMP_VMA)) --stop-address=$(($1 + $2 + OBJDUMP_VMA))" $OBJDUMP $OPTIONS $(dirname $0)/baserom.sbin > $(dirname $0)/baserom.dump || exit 1 -$OBJDUMP $OPTIONS $(dirname $0)/build/arm9.sbin > $(dirname $0)/arm9.dump +$OBJDUMP $OPTIONS $(dirname $0)/build/diamond.us/arm9.sbin > $(dirname $0)/arm9.dump diff -u $(dirname $0)/baserom.dump $(dirname $0)/arm9.dump ``` Place a clean version of the ARM9 binary as arm9/baserom.sbin (arm9/build/arm9.bin from a successful build should suffice). In your terminal, navigate to the arm9 directory and run `./asmdiff.sh 0 $(wc -c baserom.sbin) | less`, then scroll through to where the grievances begin. Fix any obvious problems in your code/tree, and rerun. If the differences are extensive, you may have induced a shift in the binary either by writing incorrect code or placing it incorrectly into the LSF. *Tip: you can specify a start address and size to only compare the portion of the ROM you are working on.* -- cgit v1.2.3