From 55cd27f6c4a56e3575ce1b4dcc1f8e53fb8ce884 Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:52:19 +0100 Subject: [PATCH] seasonal tilesets for viridian forest --- .../metatile_attributes.bin | Bin 0 -> 172 bytes .../viridian_forest_autumn/metatiles.bin | Bin 0 -> 688 bytes .../viridian_forest_autumn/palettes/00.pal | 19 ++++++ .../viridian_forest_autumn/palettes/01.pal | 19 ++++++ .../viridian_forest_autumn/palettes/02.pal | 19 ++++++ .../viridian_forest_autumn/palettes/03.pal | 19 ++++++ .../viridian_forest_autumn/palettes/04.pal | 19 ++++++ .../viridian_forest_autumn/palettes/05.pal | 19 ++++++ .../viridian_forest_autumn/palettes/06.pal | 19 ++++++ .../viridian_forest_autumn/palettes/07.pal | 19 ++++++ .../viridian_forest_autumn/palettes/08.pal | 19 ++++++ .../viridian_forest_autumn/palettes/09.pal | 19 ++++++ .../viridian_forest_autumn/palettes/10.pal | 19 ++++++ .../viridian_forest_autumn/palettes/11.pal | 19 ++++++ .../viridian_forest_autumn/palettes/12.pal | 19 ++++++ .../viridian_forest_autumn/palettes/13.pal | 19 ++++++ .../viridian_forest_autumn/palettes/14.pal | 19 ++++++ .../viridian_forest_autumn/palettes/15.pal | 19 ++++++ .../viridian_forest_autumn/tiles.png | Bin 0 -> 1207 bytes .../metatile_attributes.bin | Bin 0 -> 172 bytes .../viridian_forest_summer/metatiles.bin | Bin 0 -> 688 bytes .../viridian_forest_summer/palettes/00.pal | 19 ++++++ .../viridian_forest_summer/palettes/01.pal | 19 ++++++ .../viridian_forest_summer/palettes/02.pal | 19 ++++++ .../viridian_forest_summer/palettes/03.pal | 19 ++++++ .../viridian_forest_summer/palettes/04.pal | 19 ++++++ .../viridian_forest_summer/palettes/05.pal | 19 ++++++ .../viridian_forest_summer/palettes/06.pal | 19 ++++++ .../viridian_forest_summer/palettes/07.pal | 19 ++++++ .../viridian_forest_summer/palettes/08.pal | 19 ++++++ .../viridian_forest_summer/palettes/09.pal | 19 ++++++ .../viridian_forest_summer/palettes/10.pal | 19 ++++++ .../viridian_forest_summer/palettes/11.pal | 19 ++++++ .../viridian_forest_summer/palettes/12.pal | 19 ++++++ .../viridian_forest_summer/palettes/13.pal | 19 ++++++ .../viridian_forest_summer/palettes/14.pal | 19 ++++++ .../viridian_forest_summer/palettes/15.pal | 19 ++++++ .../viridian_forest_summer/tiles.png | Bin 0 -> 1207 bytes .../metatile_attributes.bin | Bin 0 -> 172 bytes .../viridian_forest_winter/metatiles.bin | Bin 0 -> 688 bytes .../viridian_forest_winter/palettes/00.pal | 19 ++++++ .../viridian_forest_winter/palettes/01.pal | 19 ++++++ .../viridian_forest_winter/palettes/02.pal | 19 ++++++ .../viridian_forest_winter/palettes/03.pal | 19 ++++++ .../viridian_forest_winter/palettes/04.pal | 19 ++++++ .../viridian_forest_winter/palettes/05.pal | 19 ++++++ .../viridian_forest_winter/palettes/06.pal | 19 ++++++ .../viridian_forest_winter/palettes/07.pal | 19 ++++++ .../viridian_forest_winter/palettes/08.pal | 19 ++++++ .../viridian_forest_winter/palettes/09.pal | 19 ++++++ .../viridian_forest_winter/palettes/10.pal | 19 ++++++ .../viridian_forest_winter/palettes/11.pal | 19 ++++++ .../viridian_forest_winter/palettes/12.pal | 19 ++++++ .../viridian_forest_winter/palettes/13.pal | 19 ++++++ .../viridian_forest_winter/palettes/14.pal | 19 ++++++ .../viridian_forest_winter/palettes/15.pal | 19 ++++++ .../viridian_forest_winter/tiles.png | Bin 0 -> 1207 bytes src/data/tilesets/graphics.h | 57 ++++++++++++++++++ src/data/tilesets/headers.h | 33 ++++++++++ src/data/tilesets/metatiles.h | 9 +++ src/rtc.c | 1 - src/tilesets.c | 6 ++ 62 files changed, 1017 insertions(+), 1 deletion(-) create mode 100644 data/tilesets/secondary/viridian_forest_autumn/metatile_attributes.bin create mode 100644 data/tilesets/secondary/viridian_forest_autumn/metatiles.bin create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/00.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/01.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/02.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/03.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/04.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/05.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/06.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/07.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/08.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/09.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/10.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/11.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/12.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/13.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/14.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/palettes/15.pal create mode 100644 data/tilesets/secondary/viridian_forest_autumn/tiles.png create mode 100644 data/tilesets/secondary/viridian_forest_summer/metatile_attributes.bin create mode 100644 data/tilesets/secondary/viridian_forest_summer/metatiles.bin create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/00.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/01.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/02.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/03.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/04.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/05.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/06.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/07.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/08.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/09.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/10.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/11.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/12.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/13.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/14.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/palettes/15.pal create mode 100644 data/tilesets/secondary/viridian_forest_summer/tiles.png create mode 100644 data/tilesets/secondary/viridian_forest_winter/metatile_attributes.bin create mode 100644 data/tilesets/secondary/viridian_forest_winter/metatiles.bin create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/00.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/01.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/02.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/03.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/04.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/05.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/06.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/07.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/08.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/09.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/10.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/11.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/12.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/13.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/14.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/palettes/15.pal create mode 100644 data/tilesets/secondary/viridian_forest_winter/tiles.png diff --git a/data/tilesets/secondary/viridian_forest_autumn/metatile_attributes.bin b/data/tilesets/secondary/viridian_forest_autumn/metatile_attributes.bin new file mode 100644 index 0000000000000000000000000000000000000000..990d6861cc958f9a9e32ca57b937a5f188475ec6 GIT binary patch literal 172 zcmZ{ai3tE83(z6^mJbYbIfK!U@#b=nk|e84^hty?~z!_(=*VbUTn4-2xf*eD(?) zK!Fng2eBKh323a|)O)YH>ba!6Q6@VyjrCYq)`Xcz|c`#e4PMyto~=_vK;z zL_5_St+*bd?&s}-UAEmwKax0G+Qx@&wshd~`#cmNL>D}4U<=!L2Ip`ISJ1>Jb+AK9 zFGENT@~BO%$WKo94NKRwq%cJ0A}szg^LS~}w%_Hl$`WZb77jcF9k8&V%h z>YRUo1FB&y()%>TIuWHs#xX>){Cl6;jdsOmKMGeQ<~^KG@!Pe@=Yo#`hS2>dzY78R z)TJ=K{Z{qtNA+qS=Ud|<7H2f2B`xS3KkyU3Q1RQv_c!_LJNYL#`IDdhPH~0{TtV>U4h#&rc_l?b?oJ93kx>c^NFXt}xPSpSU}RwUb`3-_FkIFREMdc= z6f58?0$K>9KLD{vI+)GK0%9jY*b*Ric}YPDkgWq^Cl?ff*gzLE@DzmvIRn`~K(<0U z5<3ZroswFd3}oj3+3^U!<{v+`z={p0*Cz;!M5J+5aQt58|@?u;l^(8K41O;AMe~ z4XXA(=uh4EpZ?yj8)}gvwAKnXW}wE}au7lN=4b9T8ae^cxe5WuGX_{%8w4@(De>U> zOaL5%tPyxDZQq$7YWOMRk+PmE6A%I-;ej(i0HnX~5d?su)cUy&0?9^-eIxxx3;>2* zmG!LpN>Jd;!AHat;1E@~pSwO2Py`IYtvsxkc2Vz3fpPAAL+KwZ&K^w$FD=(%5#pPg`z-~|BHImjJ=a^MP}{apQM1|$Zv05tif z*f;_O82yriq%PH95u&*zl|a8DmP1MSB6zW~TMq3Ec!;L}VL>0%qMXaAxET#N2h zL4OT5}$=f5K=1g|5$=d|E~pK0;umvpVuDoKfQRc zA?UUUfa{+KpuQ%6Y?2?i=<|~SVEShP4Bsn28Vx4_2{_;eV02Fc0OM<#0uMlN^ftf% zt-1b50N(ATBm<~XFFvve zD8hIYkptfMyeiWgObbAt1=*QH2mr4=#`m@Q{eS;1p!xv-7vFPAnEikMF2J*K_r32M z0Oxy2%5(oO0Fsd{1mNQPssw%i&x6lHKLWt}p7ibhKWiEm-4xCTxcI(a_W%4oREB;8 zfcO1%|IbuC{viO1_kGu=-LI%0$F^;e0N(dz|4-`cfo=QTwgBOi!1~^Oe>kLVpC2EQ z0E_kg6a9FA#rXaiz_A4bSl>SdIAU`E6?FrK%>o#LBUHb?{LtZ&&>)2COU1=PbRk&d zBjDTk5V?AW_W_)rLRZ_~2yhZuhIay3g2C`sfD1y@BJ@9iuLy4kxH9|&fMbZ#`v3`002ovPDHLkV1iU@6leed literal 0 HcmV?d00001 diff --git a/data/tilesets/secondary/viridian_forest_summer/metatile_attributes.bin b/data/tilesets/secondary/viridian_forest_summer/metatile_attributes.bin new file mode 100644 index 0000000000000000000000000000000000000000..990d6861cc958f9a9e32ca57b937a5f188475ec6 GIT binary patch literal 172 zcmZ{ai3tE83(z6^mJbYbIfK!U@#b=nk|e84^hty?~z!_(=*VbUTn4-2xf*eD(?) zK!Fng2eBKh323a|)O)YH>ba!6Q6@VyjrCYq)`Xcz|c`#e4PMyto~=_vK;z zL_5_St+*bd?&s}-UAEmwKax0G+Qx@&wshd~`#cmNL>D}4U<=!L2Ip`ISJ1>Jb+AK9 zFGENT@~BO%$WKo94NKRwq%cJ0A}szg^LS~}w%_Hl$`WZb77jcF9k8&V%h z>YRUo1FB&y()%>TIuWHs#xX>){Cl6;jdsOmKMGeQ<~^KG@!Pe@=Yo#`hS2>dzY78R z)TJ=K{Z{qtNA+qS=Ud|<7H2f2B`xS3KkyU3Q1RQv_c!_LJNYL#`IDdhPH~0{TtV>U4h#&rc_l?b?oJ93kx>c^NFXt}xPSpSU}RwUb`3-_FkIFREMdc= z6f58?0$K>9KLD{vI+)GK0%9jY*b*Ric}YPDkgWq^Cl?ff*gzLE@DzmvIRn`~K(<0U z5<3ZroswFd3}oj3+3^U!<{v+`z={p0*Cz;!M5J+5aQt58|@?u;l^(8K41O;AMe~ z4XXA(=uh4EpZ?yj8)}gvwAKnXW}wE}au7lN=4b9T8ae^cxe5WuGX_{%8w4@(De>U> zOaL5%tPyxDZQq$7YWOMRk+PmE6A%I-;ej(i0HnX~5d?su)cUy&0?9^-eIxxx3;>2* zmG!LpN>Jd;!AHat;1E@~pSwO2Py`IYtvsxkc2Vz3fpPAAL+KwZ&K^w$FD=(%5#pPg`z-~|BHImjJ=a^MP}{apQM1|$Zv05tif z*f;_O82yriq%PH95u&*zl|a8DmP1MSB6zW~TMq3Ec!;L}VL>0%qMXaAxET#N2h zL4OT5}$=f5K=1g|5$=d|E~pK0;umvpVuDoKfQRc zA?UUUfa{+KpuQ%6Y?2?i=<|~SVEShP4Bsn28Vx4_2{_;eV02Fc0OM<#0uMlN^ftf% zt-1b50N(ATBm<~XFFvve zD8hIYkptfMyeiWgObbAt1=*QH2mr4=#`m@Q{eS;1p!xv-7vFPAnEikMF2J*K_r32M z0Oxy2%5(oO0Fsd{1mNQPssw%i&x6lHKLWt}p7ibhKWiEm-4xCTxcI(a_W%4oREB;8 zfcO1%|IbuC{viO1_kGu=-LI%0$F^;e0N(dz|4-`cfo=QTwgBOi!1~^Oe>kLVpC2EQ z0E_kg6a9FA#rXaiz_A4bSl>SdIAU`E6?FrK%>o#LBUHb?{LtZ&&>)2COU1=PbRk&d zBjDTk5V?AW_W_)rLRZ_~2yhZuhIay3g2C`sfD1y@BJ@9iuLy4kxH9|&fMbZ#`v3`002ovPDHLkV1o066Tkof literal 0 HcmV?d00001 diff --git a/data/tilesets/secondary/viridian_forest_winter/metatile_attributes.bin b/data/tilesets/secondary/viridian_forest_winter/metatile_attributes.bin new file mode 100644 index 0000000000000000000000000000000000000000..990d6861cc958f9a9e32ca57b937a5f188475ec6 GIT binary patch literal 172 zcmZ{ai3tE83(z6^mJbYbIfK!U@#b=nk|e84^hty?~z!_(=*VbUTn4-2xf*eD(?) zK!Fng2eBKh323a|)O)YH>ba!6Q6@VyjrCYq)`Xcz|c`#e4PMyto~=_vK;z zL_5_St+*bd?&s}-UAEmwKax0G+Qx@&wshd~`#cmNL>D}4U<=!L2Ip`ISJ1>Jb+AK9 zFGENT@~BO%$WKo94NKRwq%cJ0A}szg^LS~}w%_Hl$`WZb77jcF9k8&V%h z>YRUo1FB&y()%>TIuWHs#xX>){Cl6;jdsOmKMGeQ<~^KG@!Pe@=Yo#`hS2>dzY78R z)TJ=K{Z{qtNA+qS=Ud|<7H2f2B`xS3KkyU3Q1RQv_c!_LJNYL#`IDdhPH~0{TtV>U4h#&rc_l?b?oJ93kx>c^NFXt}xPSpSU}RwUb`3-_FkIFREMdc= z6f58?0$K>9KLD{vI+)GK0%9jY*b*Ric}YPDkgWq^Cl?ff*gzLE@DzmvIRn`~K(<0U z5<3ZroswFd3}oj3+3^U!<{v+`z={p0*Cz;!M5J+5aQt58|@?u;l^(8K41O;AMe~ z4XXA(=uh4EpZ?yj8)}gvwAKnXW}wE}au7lN=4b9T8ae^cxe5WuGX_{%8w4@(De>U> zOaL5%tPyxDZQq$7YWOMRk+PmE6A%I-;ej(i0HnX~5d?su)cUy&0?9^-eIxxx3;>2* zmG!LpN>Jd;!AHat;1E@~pSwO2Py`IYtvsxkc2Vz3fpPAAL+KwZ&K^w$FD=(%5#pPg`z-~|BHImjJ=a^MP}{apQM1|$Zv05tif z*f;_O82yriq%PH95u&*zl|a8DmP1MSB6zW~TMq3Ec!;L}VL>0%qMXaAxET#N2h zL4OT5}$=f5K=1g|5$=d|E~pK0;umvpVuDoKfQRc zA?UUUfa{+KpuQ%6Y?2?i=<|~SVEShP4Bsn28Vx4_2{_;eV02Fc0OM<#0uMlN^ftf% zt-1b50N(ATBm<~XFFvve zD8hIYkptfMyeiWgObbAt1=*QH2mr4=#`m@Q{eS;1p!xv-7vFPAnEikMF2J*K_r32M z0Oxy2%5(oO0Fsd{1mNQPssw%i&x6lHKLWt}p7ibhKWiEm-4xCTxcI(a_W%4oREB;8 zfcO1%|IbuC{viO1_kGu=-LI%0$F^;e0N(dz|4-`cfo=QTwgBOi!1~^Oe>kLVpC2EQ z0E_kg6a9FA#rXaiz_A4bSl>SdIAU`E6?FrK%>o#LBUHb?{LtZ&&>)2COU1=PbRk&d zBjDTk5V?AW_W_)rLRZ_~2yhZuhIay3g2C`sfD1y@BJ@9iuLy4kxH9|&fMbZ#`v3`002ovPDHLkV1g_-87Ke% literal 0 HcmV?d00001 diff --git a/src/data/tilesets/graphics.h b/src/data/tilesets/graphics.h index 482d207ab..b4c464366 100644 --- a/src/data/tilesets/graphics.h +++ b/src/data/tilesets/graphics.h @@ -1521,3 +1521,60 @@ const u16 gTilesetPalettes_PalletTownWinter[][16] = }; const u32 gTilesetTiles_PalletTownWinter[] = INCBIN_U32("data/tilesets/secondary/pallet_town_winter/tiles.4bpp.lz"); + +const u16 gTilesetPalettes_ViridianForestAutumn[][16] = +{ + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/00.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/01.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/02.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/03.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/04.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/05.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/06.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/07.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/08.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/09.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/10.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/11.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/palettes/12.gbapal"), +}; + +const u32 gTilesetTiles_ViridianForestAutumn[] = INCBIN_U32("data/tilesets/secondary/viridian_forest_autumn/tiles.4bpp.lz"); + +const u16 gTilesetPalettes_ViridianForestSummer[][16] = +{ + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/00.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/01.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/02.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/03.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/04.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/05.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/06.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/07.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/08.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/09.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/10.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/11.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/palettes/12.gbapal"), +}; + +const u32 gTilesetTiles_ViridianForestSummer[] = INCBIN_U32("data/tilesets/secondary/viridian_forest_summer/tiles.4bpp.lz"); + +const u16 gTilesetPalettes_ViridianForestWinter[][16] = +{ + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/00.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/01.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/02.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/03.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/04.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/05.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/06.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/07.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/08.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/09.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/10.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/11.gbapal"), + INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/palettes/12.gbapal"), +}; + +const u32 gTilesetTiles_ViridianForestWinter[] = INCBIN_U32("data/tilesets/secondary/viridian_forest_winter/tiles.4bpp.lz"); diff --git a/src/data/tilesets/headers.h b/src/data/tilesets/headers.h index cf31a6fb5..6b0c4ca34 100644 --- a/src/data/tilesets/headers.h +++ b/src/data/tilesets/headers.h @@ -812,3 +812,36 @@ const struct Tileset gTileset_PalletTownWinter = .metatileAttributes = gMetatileAttributes_PalletTownWinter, .callback = NULL, }; + +const struct Tileset gTileset_ViridianForestAutumn = +{ + .isCompressed = TRUE, + .isSecondary = TRUE, + .tiles = gTilesetTiles_ViridianForestAutumn, + .palettes = gTilesetPalettes_ViridianForestAutumn, + .metatiles = gMetatiles_ViridianForestAutumn, + .metatileAttributes = gMetatileAttributes_ViridianForestAutumn, + .callback = NULL, +}; + +const struct Tileset gTileset_ViridianForestSummer = +{ + .isCompressed = TRUE, + .isSecondary = TRUE, + .tiles = gTilesetTiles_ViridianForestSummer, + .palettes = gTilesetPalettes_ViridianForestSummer, + .metatiles = gMetatiles_ViridianForestSummer, + .metatileAttributes = gMetatileAttributes_ViridianForestSummer, + .callback = NULL, +}; + +const struct Tileset gTileset_ViridianForestWinter = +{ + .isCompressed = TRUE, + .isSecondary = TRUE, + .tiles = gTilesetTiles_ViridianForestWinter, + .palettes = gTilesetPalettes_ViridianForestWinter, + .metatiles = gMetatiles_ViridianForestWinter, + .metatileAttributes = gMetatileAttributes_ViridianForestWinter, + .callback = NULL, +}; diff --git a/src/data/tilesets/metatiles.h b/src/data/tilesets/metatiles.h index 46ee19c64..eae8dcc58 100644 --- a/src/data/tilesets/metatiles.h +++ b/src/data/tilesets/metatiles.h @@ -219,3 +219,12 @@ const u32 gMetatileAttributes_PalletTownAutumn[] = INCBIN_U32("data/tilesets/sec const u16 gMetatiles_PalletTownWinter[] = INCBIN_U16("data/tilesets/secondary/pallet_town_winter/metatiles.bin"); const u32 gMetatileAttributes_PalletTownWinter[] = INCBIN_U32("data/tilesets/secondary/pallet_town_winter/metatile_attributes.bin"); + +const u16 gMetatiles_ViridianForestAutumn[] = INCBIN_U16("data/tilesets/secondary/viridian_forest_autumn/metatiles.bin"); +const u32 gMetatileAttributes_ViridianForestAutumn[] = INCBIN_U32("data/tilesets/secondary/viridian_forest_autumn/metatile_attributes.bin"); + +const u16 gMetatiles_ViridianForestSummer[] = INCBIN_U16("data/tilesets/secondary/viridian_forest_summer/metatiles.bin"); +const u32 gMetatileAttributes_ViridianForestSummer[] = INCBIN_U32("data/tilesets/secondary/viridian_forest_summer/metatile_attributes.bin"); + +const u16 gMetatiles_ViridianForestWinter[] = INCBIN_U16("data/tilesets/secondary/viridian_forest_winter/metatiles.bin"); +const u32 gMetatileAttributes_ViridianForestWinter[] = INCBIN_U32("data/tilesets/secondary/viridian_forest_winter/metatile_attributes.bin"); diff --git a/src/rtc.c b/src/rtc.c index 18b5c8edd..24375a9ac 100644 --- a/src/rtc.c +++ b/src/rtc.c @@ -519,6 +519,5 @@ u32 GetGen5TimeOfDayStart(enum TimeOfDay timeOfDay) void UpdateLoadedSeason() { - DebugPrintfLevel(MGBA_LOG_ERROR, "UpdateLoadedSeason"); gLoadedSeason = GetSeason(); } diff --git a/src/tilesets.c b/src/tilesets.c index ba1f7f4d8..65acbe5ad 100644 --- a/src/tilesets.c +++ b/src/tilesets.c @@ -41,6 +41,12 @@ static const struct Tileset* const gSeasonTilesetsSecondary[][SEASON_WINTER + 1] [SEASON_AUTUMN] = &gTileset_PalletTownAutumn, [SEASON_WINTER] = &gTileset_PalletTownWinter, }, + { + [SEASON_SPRING] = &gTileset_ViridianForest, + [SEASON_SUMMER] = &gTileset_ViridianForestSummer, + [SEASON_AUTUMN] = &gTileset_ViridianForestAutumn, + [SEASON_WINTER] = &gTileset_ViridianForestWinter, + }, SEASON_TILESETS_TERMINATOR };