Skip to content

Commit

Permalink
Patch projects so CI will build (#1071)
Browse files Browse the repository at this point in the history
Fixes #1070
  • Loading branch information
Rangi42 authored Sep 30, 2022
1 parent dec4133 commit 68ad926
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 29 deletions.
27 changes: 27 additions & 0 deletions test/patches/pokecrystal.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/Makefile b/Makefile
index 387c2cca1..856968189 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ tools:
$(MAKE) -C tools/


-RGBASMFLAGS = -L -Weverything -Wnumeric-string=2 -Wtruncation=1
+RGBASMFLAGS = -L -Weverything -Wnumeric-string=2 -Wtruncation=1 -Q8
# Create a sym/map for debug purposes if `make` run with `DEBUG=1`
ifeq ($(DEBUG),1)
RGBASMFLAGS += -E
diff --git a/macros/data.asm b/macros/data.asm
index c2686c9f4..4dac70f3a 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -97,7 +97,7 @@ MACRO sine_table
; \1 samples of sin(x) from x=0 to x<32768 (pi radians)
DEF x = 0
rept \1
- dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
- DEF x += DIV(32768, \1) ; a circle has 65536 "degrees"
+ dw sin(x)
+ DEF x += 0.5 / (\1)
endr
ENDM
46 changes: 17 additions & 29 deletions test/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,20 @@ done
# When updating subprojects, change the commit being checked out, and set the `shallow-since`
# to the day before, to reduce the amount of refs being transferred and thus speed up CI.

if [ ! -d pokecrystal ]; then
git clone https://github.com/pret/pokecrystal.git --shallow-since=2022-03-12 --single-branch
fi
pushd pokecrystal
git fetch
git checkout a3e31d6463e6313aed12ebc733b3f772f2fc78d7
make clean
make -j4 compare RGBDS=../../
popd

if [ ! -d pokered ]; then
git clone https://github.com/pret/pokered.git --shallow-since=2022-03-07 --single-branch
fi
pushd pokered
git fetch
git checkout a75dd222709c92ae136d835ff2451391d5a88e45
make clean
make -j4 compare RGBDS=../../
popd

if [ ! -d ucity ]; then
git clone https://github.com/AntonioND/ucity.git --shallow-since=2020-11-01 --single-branch
fi
pushd ucity
git fetch
git checkout d8878233da7a6569f09f87b144cb5bf140146a0f
make clean
make -j4 RGBDS=../../
popd
test_downstream() { # owner/repo shallow-since commit make-target
if [ ! -d ${1##*/} ]; then
git clone https://github.com/$1.git --shallow-since=$2 --single-branch
fi
pushd ${1##*/}
git checkout -f $3
if [ -f ../patches/${1##*/}.patch ]; then
git apply --ignore-whitespace ../patches/${1##*/}.patch
fi
make clean
make -j4 $4 RGBDS=../../
popd
}

test_downstream pret/pokecrystal 2022-09-26 a9869f18962353b056559dc14dfc00fef0df5978 compare
test_downstream pret/pokered 2022-09-25 22859c4bb70dba17994c9b47b07f657ea082875d compare
test_downstream AntonioND/ucity 2022-04-20 d8878233da7a6569f09f87b144cb5bf140146a0f ''

0 comments on commit 68ad926

Please sign in to comment.