From 0feb0e47c922694b2de2f49dfb52db4cb1eee651 Mon Sep 17 00:00:00 2001
From: cbt6 <91667135+cbt6@users.noreply.github.com>
Date: Wed, 13 Jul 2022 06:09:56 +0800
Subject: [PATCH] Use constants and fix rock fragments' palettes

---
 .../pics/deoxys_rock_fragment_bottom_left.png   | Bin 201 -> 201 bytes
 .../pics/deoxys_rock_fragment_bottom_right.png  | Bin 193 -> 193 bytes
 .../pics/deoxys_rock_fragment_top_left.png      | Bin 201 -> 201 bytes
 .../pics/deoxys_rock_fragment_top_right.png     | Bin 202 -> 202 bytes
 src/field_effect.c                              |   2 +-
 5 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png
index d5e36b8d65bc54e2ef58acda9e78e898e5a6882d..ed67e8cf9a9d1009750b17d36d4896cf55ff4ff5 100644
GIT binary patch
delta 55
zcmX@fc#?5~jqX_mh5tc8|If~`Hj<dkz`(#*666=m;PC858j!<Y;_2(k{*0YRj79Ot
KL~H(unF#<RRuU8d

delta 55
zcmX@fc#?5~jjn=%LQqgpcXzk)!Hd@!7#J8!g8YIR9G=}s19I3)Jbhi+pRscZ$rx6~
KyBJN(OaK7*r4cv)

diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png
index 8db25e52e9bc6c6ed69722d628a9c8d468f282af..18e3fabead7f90e2a32761667e63a62c9912b27c 100644
GIT binary patch
delta 55
zcmX@ec#v^|jqX_mh5tc8|If~`Hj<dkz`(#*666=m;PC858j!<Y;_2(k{*0YRj76MV
Kd)>5&nGpaSh7rvG

delta 55
zcmX@ec#v^|jjn=%LQqgpcXzk)!Hd@!7#J8!g8YIR9G=}s19I3)Jbhi+pRscZ$tVcF
KPdP9#GXenkBN68S

diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png
index cca7ea336dbf13470ded4935e8e36d1d03fe8356..af1db7882753008485660c8a301ae412ebdf217e 100644
GIT binary patch
delta 55
zcmX@fc#?5~jqX_mh5tc8|If~`Hj<dkz`(#*666=m;PC858j!<Y;_2(k{*0YRjK$bo
K!^?eQW&!{nz!7%<

delta 55
zcmX@fc#?5~jjn=%LQqgpcXzk)!Hd@!7#J8!g8YIR9G=}s19I3)Jbhi+pRscZ$qF4(
KW?`I|nE(LxNf5RG

diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png
index 2d14a96a976a2f3fdb9f88e3cd6c4a4388fecaf3..bafa44350c66d911153672e6d62f5f27bbc9e618 100644
GIT binary patch
delta 55
zcmX@bc#3g?jqX_mh5tc8|If~`Hj<dkz`(#*666=m;PC858j!<Y;_2(k{*0YRj73|;
K<&xmU%tQbn;1SIL

delta 55
zcmX@bc#3g?jjn=%LQqgpcXzk)!Hd@!7#J8!g8YIR9G=}s19I3)Jbhi+pRscZ$uh5)
KtnztcW+DLmkP;FA

diff --git a/src/field_effect.c b/src/field_effect.c
index e58691c07..5bf4c0934 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -4012,7 +4012,7 @@ static void SpriteCB_DeoxysRockFragment(struct Sprite *sprite)
         sprite->y += 12;
         break;
     }
-    if (sprite->x < -4 || sprite->x > 244 || sprite->y < -4 || sprite->y > 164)
+    if (sprite->x < -4 || sprite->x > DISPLAY_WIDTH + 4 || sprite->y < -4 || sprite->y > DISPLAY_HEIGHT + 4)
         DestroySprite(sprite);
 }