Update the pret repos being tested (#1198)

This commit is contained in:
Rangi
2023-11-01 18:07:41 -04:00
committed by GitHub
parent 32bc68d06d
commit 73e9aac135
2 changed files with 2 additions and 43 deletions

View File

@@ -69,7 +69,7 @@ case "$actionname" in
esac
if "$nonfree"; then
action pret/pokecrystal 2022-09-29 70a3ec1accb6de1c1c273470af0ddfa2edc1b0a9
action pret/pokered 2022-09-29 2b52ceb718b55dce038db24d177715ae4281d065
action pret/pokecrystal 2023-10-22 38667169809b81eb39990b4341f9919332d27248
action pret/pokered 2023-10-10 b302e93674f376f2881cbd931a698345ad27bec3
fi
action AntonioND/ucity 2022-04-20 d8878233da7a6569f09f87b144cb5bf140146a0f

View File

@@ -1,41 +0,0 @@
diff --git a/Makefile b/Makefile
index bf54eb4ce..d75f86aae 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
@@ -208,9 +208,11 @@ gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp g
### Misc file-specific graphics rules
-gfx/pokemon/%/back.2bpp: rgbgfx += -h
+gfx/pokemon/%/back.2bpp: rgbgfx += -h -c embedded
+gfx/pokemon/%/front.2bpp: rgbgfx += -c embedded
+gfx/pokemon/unown_%/front.2bpp: rgbgfx =
-gfx/trainers/%.2bpp: rgbgfx += -h
+gfx/trainers/%.2bpp: rgbgfx += -h -c embedded
gfx/pokemon/egg/unused_front.2bpp: rgbgfx += -h
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