From d433f8bc2d9fc207eb77f088777060a93259cb5e Mon Sep 17 00:00:00 2001 From: Massena Date: Wed, 12 Jan 2022 16:43:22 +0100 Subject: [PATCH] Scarlet --- CMakeLists.txt | 2 ++ assets-cg/scarlet.ase | Bin 9731 -> 9432 bytes assets-cg/scarletL.png | Bin 0 -> 3779 bytes assets-cg/scarletR.png | Bin 0 -> 3857 bytes include/conf.h | 2 ++ include/player.h | 4 ++-- src/main.c | 5 ++++- 7 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 assets-cg/scarletL.png create mode 100644 assets-cg/scarletR.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 11c1cef..1ab7fa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,8 @@ set(SOURCES set(ASSETS_cg assets-cg/tileset.png assets-cg/hooksel.png + assets-cg/scarletR.png + assets-cg/scarletL.png ) fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} WITH_METADATA) diff --git a/assets-cg/scarlet.ase b/assets-cg/scarlet.ase index b4e34c34e3535211820c28c0cd86158112572065..be06a0488fd149969378e57a356d39cd680e295d 100644 GIT binary patch delta 1063 zcmZqnx#7uqLxq9i!BQCpv5B1Jj59Yjva_(CJTdGW>KmTgY;xRHaSM-$+~O?jI5LMg~KMF5fYkwjICLc8K~+%BSP0@ zAd^*rk%4t`68j@*blICQSq7%bg~Fkew{T3vFyRhV4a?*>&es^S4`C)uPU5=3^pRn* zp_EuXx-}t7s}(Bo_` zGkNv%uOV~t4!??rJsQVLUS!)sC=O5C(7`8?rj;^ohYvBq~|i|1aE4BN57Xu)dV?IteI znx8zZYA7=JWpCsb&cCIb@s<3VstIqKcgk9xaj0_GaWbr(F_PEL_65UyDTZHMrL6xM zCOZg=VT8hUpobu#42z4aJarhM{Q#y49NHn^IJ?5zj-l>0hC0#7_xb99@g2`E4vz0T zlY<2$FkEo~rVpMX-UyUqn0^VS3hoN-$#(@CfTqU@i8HgpMY~Y!^A*LkPa2rcK)z<# z{82@Saq{D#VafxJ-_f7nococ@aYu zn!QERm`>w?8+1_2W%6_B>p++7mjSwL@*i2}$x^Z>fqZ=hkW2r_vM|D(Eh#Sw;(%o) zOUk=U-merj`Kdx0h7;aH1Ca%+YK7u1m=Qp)fplF2@+T^T>;rlAxAI*K6Hq+?0KQ%E A_y7O^ delta 1034 zcmccN+3dr~tj56bV5uyF@I=mX#*G^r*;(1=FfcGkD6mcLXH|-22C|U=3xii_ZUGAe z3z8U+$-)qxn3KcCz>7sVo1Z}lUDz$NC{>t2X7V>yIYx%bqHG3?Oq2ci!zM3a7n;0| ztyvPJ{y!r^*JU7+Re_O#X|fmlBcKjl4sm8CATNMFbn+aIi9iuOPH{%Y$!?slG4wt} z=;gX$$OJU?*GDFXFF=|JC?f%u1rk7jY~w8;A7UfIU4F7g467JlH||`0I;=f$)-CvWB{mqxeo0Zb*>Um@VISk2pxq3$+@I?>77 z`07DnAS@0J$1fPJxB$}w59PxGm@c>kQw4Vc_v9^t4Hz!Ch@nn&@(!U=Bp2MFESyd7 zgtId=0#5)Pff9j}*C~UNK!BplWG86<=X0 zHeZxsVFa26cIW1IvZ9!#!PQQFC+jjfLH+07Wd?f!;&&;{~O= JKrJYK0stmK!g~M! diff --git a/assets-cg/scarletL.png b/assets-cg/scarletL.png new file mode 100644 index 0000000000000000000000000000000000000000..26f97a2a0627cac0eade7f3de067a4697d92a9b9 GIT binary patch literal 3779 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