mirror of
https://github.com/pret/pokeemerald.git
synced 2026-08-24 19:15:33 -05:00
Merge 0b43f66d94 into 83df84e406
This commit is contained in:
8
.github/calcrom/webhook.sh
vendored
8
.github/calcrom/webhook.sh
vendored
@@ -1,11 +1,11 @@
|
||||
#!/bin/bash -ex
|
||||
|
||||
build_name=$1
|
||||
map_file=$build_name.map
|
||||
if [ ! -f $map_file ]; then
|
||||
build_name="$1"
|
||||
map_file="$build_name.map"
|
||||
if [ ! -f "$map_file" ]; then
|
||||
echo "$map_file does not exist!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
|
||||
output=$(perl "$(dirname "$0")/calcrom.pl" "$build_name.map" | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
|
||||
curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`\\n$build_name progress:\\n$output\\n\`\`\`\"}" -H "Content-Type: application/json" -X POST "$CALCROM_DISCORD_WEBHOOK_URL"
|
||||
|
||||
10
asmdiff.sh
10
asmdiff.sh
@@ -6,14 +6,14 @@ else
|
||||
OBJDUMP_BIN="arm-none-eabi-objdump"
|
||||
fi
|
||||
|
||||
OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
|
||||
OBJDUMP=("$OBJDUMP_BIN" -D -bbinary -marmv4t -Mforce-thumb)
|
||||
|
||||
if [ $(($1)) -ge $((0x8000000)) ]; then
|
||||
OPTIONS="--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2))"
|
||||
OPTIONS=(--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2)))
|
||||
else
|
||||
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
|
||||
OPTIONS=(--start-address=$(($1)) --stop-address=$(($1 + $2)))
|
||||
fi
|
||||
|
||||
$OBJDUMP $OPTIONS baserom.gba > baserom.dump
|
||||
$OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
|
||||
"${OBJDUMP[@]}" "${OPTIONS[@]}" baserom.gba > baserom.dump
|
||||
"${OBJDUMP[@]}" "${OPTIONS[@]}" pokeemerald.gba > pokeemerald.dump
|
||||
diff -u baserom.dump pokeemerald.dump
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
echo "This script is deprecated. Next time, run \"make tools\" instead."
|
||||
for dname in tools/*; do
|
||||
if [ -f ${dname}/Makefile ]; then
|
||||
make -C ${dname} CXX=${1:-g++} --no-print-directory
|
||||
if [ -f "${dname}/Makefile" ]; then
|
||||
make -C "${dname}" "CXX=${1:-g++}" --no-print-directory
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user