From 0d3661f364e5f82cc1ae21e0d660a63dfdad26ab Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 3 Jun 2021 12:32:14 -0400 Subject: [PATCH 1/5] Rename funcs and data in tileset_anims.c --- src/tileset_anims.c | 256 ++++++++++++++++++++++---------------------- 1 file changed, 130 insertions(+), 126 deletions(-) diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 04e129049..fb18bbc0d 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -17,117 +17,121 @@ static void (*sSecondaryTilesetAnimCallback)(u16); static void _InitPrimaryTilesetAnimation(void); static void _InitSecondaryTilesetAnimation(void); -static const u16 gUnknown_83A73E0[] = INCBIN_U16("graphics/tileset_anims/anim_0_0.bin"); -static const u16 gUnknown_83A7460[] = INCBIN_U16("graphics/tileset_anims/anim_0_1.bin"); -static const u16 gUnknown_83A74E0[] = INCBIN_U16("graphics/tileset_anims/anim_0_2.bin"); -static const u16 gUnknown_83A7560[] = INCBIN_U16("graphics/tileset_anims/anim_0_3.bin"); -static const u16 gUnknown_83A75E0[] = INCBIN_U16("graphics/tileset_anims/anim_0_4.bin"); +// palette: general 00 +static const u16 sTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_0_0.bin"); +static const u16 sTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_0_1.bin"); +static const u16 sTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_0_2.bin"); +static const u16 sTilesetAnims_General_Flower_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_0_3.bin"); +static const u16 sTilesetAnims_General_Flower_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_0_4.bin"); -static const u16 *const gUnknown_83A7660[] = { - gUnknown_83A73E0, - gUnknown_83A7460, - gUnknown_83A74E0, - gUnknown_83A7560, - gUnknown_83A75E0 +static const u16 *const sTilesetAnims_General_Flower[] = { + sTilesetAnims_General_Flower_Frame0, + sTilesetAnims_General_Flower_Frame1, + sTilesetAnims_General_Flower_Frame2, + sTilesetAnims_General_Flower_Frame3, + sTilesetAnims_General_Flower_Frame4 }; -static const u16 gUnknown_83A7674[] = INCBIN_U16("graphics/tileset_anims/anim_1_0.bin"); -static const u16 gUnknown_83A7C74[] = INCBIN_U16("graphics/tileset_anims/anim_1_1.bin"); -static const u16 gUnknown_83A8274[] = INCBIN_U16("graphics/tileset_anims/anim_1_2.bin"); -static const u16 gUnknown_83A8874[] = INCBIN_U16("graphics/tileset_anims/anim_1_3.bin"); -static const u16 gUnknown_83A8E74[] = INCBIN_U16("graphics/tileset_anims/anim_1_4.bin"); -static const u16 gUnknown_83A9474[] = INCBIN_U16("graphics/tileset_anims/anim_1_5.bin"); -static const u16 gUnknown_83A9A74[] = INCBIN_U16("graphics/tileset_anims/anim_1_6.bin"); -static const u16 gUnknown_83AA074[] = INCBIN_U16("graphics/tileset_anims/anim_1_7.bin"); +// palette: general 04 +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_1_0.bin"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_1_1.bin"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_1_2.bin"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_1_3.bin"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_1_4.bin"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5[] = INCBIN_U16("graphics/tileset_anims/anim_1_5.bin"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6[] = INCBIN_U16("graphics/tileset_anims/anim_1_6.bin"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7[] = INCBIN_U16("graphics/tileset_anims/anim_1_7.bin"); -static const u16 *const gUnknown_83AA654[] = { - gUnknown_83A7674, - gUnknown_83A7C74, - gUnknown_83A8274, - gUnknown_83A8874, - gUnknown_83A8E74, - gUnknown_83A9474, - gUnknown_83A9A74, - gUnknown_83AA074 +static const u16 *const sTilesetAnims_General_Water_Current_LandWatersEdge[] = { + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7 }; -static const u16 gUnknown_83AA674[] = INCBIN_U16("graphics/tileset_anims/anim_2_0.bin"); -static const u16 gUnknown_83AA8B4[] = INCBIN_U16("graphics/tileset_anims/anim_2_1.bin"); -static const u16 gUnknown_83AAAF4[] = INCBIN_U16("graphics/tileset_anims/anim_2_2.bin"); -static const u16 gUnknown_83AAD34[] = INCBIN_U16("graphics/tileset_anims/anim_2_3.bin"); -static const u16 gUnknown_83AAF74[] = INCBIN_U16("graphics/tileset_anims/anim_2_4.bin"); -static const u16 gUnknown_83AB1B4[] = INCBIN_U16("graphics/tileset_anims/anim_2_5.bin"); -static const u16 gUnknown_83AB3F4[] = INCBIN_U16("graphics/tileset_anims/anim_2_6.bin"); -static const u16 gUnknown_83AB634[] = INCBIN_U16("graphics/tileset_anims/anim_2_7.bin"); +// palette: general 04 +static const u16 sTilesetAnims_General_SandWatersEdge_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_2_0.bin"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_2_1.bin"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_2_2.bin"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_2_3.bin"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_2_4.bin"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame5[] = INCBIN_U16("graphics/tileset_anims/anim_2_5.bin"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame6[] = INCBIN_U16("graphics/tileset_anims/anim_2_6.bin"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame7[] = INCBIN_U16("graphics/tileset_anims/anim_2_7.bin"); -static const u16 *const gUnknown_83AB874[] = { - gUnknown_83AA674, - gUnknown_83AA8B4, - gUnknown_83AAAF4, - gUnknown_83AAD34, - gUnknown_83AAF74, - gUnknown_83AB1B4, - gUnknown_83AB3F4, - gUnknown_83AB634 +static const u16 *const sTilesetAnims_General_SandWatersEdge[] = { + sTilesetAnims_General_SandWatersEdge_Frame0, + sTilesetAnims_General_SandWatersEdge_Frame1, + sTilesetAnims_General_SandWatersEdge_Frame2, + sTilesetAnims_General_SandWatersEdge_Frame3, + sTilesetAnims_General_SandWatersEdge_Frame4, + sTilesetAnims_General_SandWatersEdge_Frame5, + sTilesetAnims_General_SandWatersEdge_Frame6, + sTilesetAnims_General_SandWatersEdge_Frame7 }; -static const u16 gUnknown_83AB894[] = INCBIN_U16("graphics/tileset_anims/anim_3_0.bin"); -static const u16 gUnknown_83AB994[] = INCBIN_U16("graphics/tileset_anims/anim_3_1.bin"); -static const u16 gUnknown_83ABA94[] = INCBIN_U16("graphics/tileset_anims/anim_3_2.bin"); -static const u16 gUnknown_83ABB94[] = INCBIN_U16("graphics/tileset_anims/anim_3_3.bin"); -static const u16 gUnknown_83ABC94[] = INCBIN_U16("graphics/tileset_anims/anim_3_4.bin"); +// palette: general 00 +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_3_0.bin"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_3_1.bin"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_3_2.bin"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_3_3.bin"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_3_4.bin"); static const u16 gUnknown_83ABD94[16] = {}; -static const u16 *const gUnknown_83ABDB4[] = { - gUnknown_83AB894, - gUnknown_83AB994, - gUnknown_83ABA94, - gUnknown_83ABB94, - gUnknown_83ABC94 +static const u16 *const sTilesetAnims_CeladonCity_Fountain[] = { + sTilesetAnims_CeladonCity_Fountain_Frame0, + sTilesetAnims_CeladonCity_Fountain_Frame1, + sTilesetAnims_CeladonCity_Fountain_Frame2, + sTilesetAnims_CeladonCity_Fountain_Frame3, + sTilesetAnims_CeladonCity_Fountain_Frame4 }; -static const u16 gUnknown_83ABDC8[] = INCBIN_U16("graphics/tileset_anims/anim_4_0.bin"); -static const u16 gUnknown_83ABEC8[] = INCBIN_U16("graphics/tileset_anims/anim_4_1.bin"); -static const u16 gUnknown_83ABFC8[] = INCBIN_U16("graphics/tileset_anims/anim_4_2.bin"); -static const u16 gUnknown_83AC0C8[] = INCBIN_U16("graphics/tileset_anims/anim_4_3.bin"); -static const u16 gUnknown_83AC1C8[0x10] = {}; +static const u16 sTilesetAnims_SilphCo_Fountain_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_4_0.bin"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_4_1.bin"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_4_2.bin"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_4_3.bin"); +static const u16 gUnknown_83AC1C8[16] = {}; -static const u16 *const gUnknown_83AC1E8[] = { - gUnknown_83ABDC8, - gUnknown_83ABEC8, - gUnknown_83ABFC8, - gUnknown_83AC0C8 +static const u16 *const sTilesetAnims_SilphCo_Fountain[] = { + sTilesetAnims_SilphCo_Fountain_Frame0, + sTilesetAnims_SilphCo_Fountain_Frame1, + sTilesetAnims_SilphCo_Fountain_Frame2, + sTilesetAnims_SilphCo_Fountain_Frame3 }; -static const u16 gUnknown_83AC1F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_0.bin"); -static const u16 gUnknown_83AC2F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_1.bin"); -static const u16 gUnknown_83AC3F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_2.bin"); -static const u16 gUnknown_83AC4F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_3.bin"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_5_0.bin"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_5_1.bin"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_5_2.bin"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_5_3.bin"); -static const u16 *const gUnknown_83AC5F8[] = { - gUnknown_83AC1F8, - gUnknown_83AC2F8, - gUnknown_83AC3F8, - gUnknown_83AC4F8 +static const u16 *const sTilesetAnims_MtEmber_Steam[] = { + sTilesetAnims_MtEmber_Steam_Frame0, + sTilesetAnims_MtEmber_Steam_Frame1, + sTilesetAnims_MtEmber_Steam_Frame2, + sTilesetAnims_MtEmber_Steam_Frame3 }; -static const u16 gUnknown_83AC608[] = INCBIN_U16("graphics/tileset_anims/anim_6_0.bin"); -static const u16 gUnknown_83AC6E8[] = INCBIN_U16("graphics/tileset_anims/anim_6_1.bin"); +static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_6_0.bin"); +static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_6_1.bin"); -static const u16 *const gUnknown_83AC7C8[] = { - gUnknown_83AC608, - gUnknown_83AC6E8 +static const u16 *const sTilesetAnims_VermilionGym_MotorizedDoor[] = { + sTilesetAnims_VermilionGym_MotorizedDoor_Frame0, + sTilesetAnims_VermilionGym_MotorizedDoor_Frame1 }; -static const u16 gUnknown_83AC7D0[] = INCBIN_U16("graphics/tileset_anims/anim_7_0.bin"); -static const u16 gUnknown_83AC850[] = INCBIN_U16("graphics/tileset_anims/anim_7_1.bin"); -static const u16 gUnknown_83AC8D0[] = INCBIN_U16("graphics/tileset_anims/anim_7_2.bin"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_7_0.bin"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_7_1.bin"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_7_2.bin"); -static const u16 *const gUnknown_83AC950[] = { - gUnknown_83AC7D0, - gUnknown_83AC850, - gUnknown_83AC8D0, - gUnknown_83AC850 +static const u16 *const sTilesetAnims_CeladonGym_Flowers[] = { + sTilesetAnims_CeladonGym_Flowers_Frame0, + sTilesetAnims_CeladonGym_Flowers_Frame1, + sTilesetAnims_CeladonGym_Flowers_Frame2, + sTilesetAnims_CeladonGym_Flowers_Frame1 }; static void ResetTilesetAnimBuffer(void) @@ -201,128 +205,128 @@ static void _InitSecondaryTilesetAnimation(void) gMapHeader.mapLayout->secondaryTileset->callback(); } -static void sub_80700A4(u16 timer) +static void QueueAnimTiles_General_Flower(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83A7660[timer % NELEMS(gUnknown_83A7660)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); + AppendTilesetAnimToBuffer(sTilesetAnims_General_Flower[timer % NELEMS(sTilesetAnims_General_Flower)], (u16 *)(BG_CHAR_ADDR(0) + TILE_OFFSET_4BPP(508)), 4 * TILE_SIZE_4BPP); } -static void sub_80700D0(u16 timer) +static void QueueAnimTiles_General_Water_Current_LandWatersEdge(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AA654[timer % NELEMS(gUnknown_83AA654)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 0x600); + AppendTilesetAnimToBuffer(sTilesetAnims_General_Water_Current_LandWatersEdge[timer % NELEMS(sTilesetAnims_General_Water_Current_LandWatersEdge)], (u16 *)(BG_CHAR_ADDR(0) + TILE_OFFSET_4BPP(416)), 48 * TILE_SIZE_4BPP); } -static void sub_80700F8(u16 timer) +static void QueueAnimTiles_General_SandWatersEdge(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AB874[timer % NELEMS(gUnknown_83AB874)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x240); + AppendTilesetAnimToBuffer(sTilesetAnims_General_SandWatersEdge[timer % NELEMS(sTilesetAnims_General_SandWatersEdge)], (u16 *)(BG_CHAR_ADDR(0) + TILE_OFFSET_4BPP(464)), 18 * TILE_SIZE_4BPP); } -static void sub_8070120(u16 timer) +static void TilesetAnim_General(u16 timer) { if (timer % 8 == 0) - sub_80700F8(timer >> 3); + QueueAnimTiles_General_SandWatersEdge(timer >> 3); if (timer % 16 == 1) - sub_80700D0(timer >> 4); + QueueAnimTiles_General_Water_Current_LandWatersEdge(timer >> 4); if (timer % 16 == 2) - sub_80700A4(timer >> 4); + QueueAnimTiles_General_Flower(timer >> 4); } void InitTilesetAnim_General(void) { sPrimaryTilesetAnimCounter = 0; sPrimaryTilesetAnimCounterMax = 640; - sPrimaryTilesetAnimCallback = sub_8070120; + sPrimaryTilesetAnimCallback = TilesetAnim_General; } -static void sub_807017C(u16 timer) +static void QueueAnimTiles_CeladonCity_Fountain(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83ABDB4[timer % NELEMS(gUnknown_83ABDB4)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 0x100); + AppendTilesetAnimToBuffer(sTilesetAnims_CeladonCity_Fountain[timer % NELEMS(sTilesetAnims_CeladonCity_Fountain)], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(232)), 8 * TILE_SIZE_4BPP); } -static void sub_80701AC(u16 timer) +static void TilesetAnim_CeladonCity(u16 timer) { if (timer % 12 == 0) - sub_807017C(timer / 12); + QueueAnimTiles_CeladonCity_Fountain(timer / 12); } void InitTilesetAnim_CeladonCity(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 120; - sSecondaryTilesetAnimCallback = sub_80701AC; + sSecondaryTilesetAnimCallback = TilesetAnim_CeladonCity; } -static void sub_80701FC(u16 timer) +static void QueueAnimTiles_SilphCo_Fountain(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AC1E8[timer % NELEMS(gUnknown_83AC1E8)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 0x100); + AppendTilesetAnimToBuffer(sTilesetAnims_SilphCo_Fountain[timer % NELEMS(sTilesetAnims_SilphCo_Fountain)], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(464)), 8 * TILE_SIZE_4BPP); } -static void sub_8070224(u16 timer) +static void TilesetAnim_SilphCo(u16 timer) { if (timer % 10 == 0) - sub_80701FC(timer / 10); + QueueAnimTiles_SilphCo_Fountain(timer / 10); } void InitTilesetAnim_SilphCo(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 160; - sSecondaryTilesetAnimCallback = sub_8070224; + sSecondaryTilesetAnimCallback = TilesetAnim_SilphCo; } -static void sub_8070274(u16 timer) +static void QueueAnimTiles_MtEmber_Steam(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AC5F8[timer % NELEMS(gUnknown_83AC5F8)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 0x100); + AppendTilesetAnimToBuffer(sTilesetAnims_MtEmber_Steam[timer % NELEMS(sTilesetAnims_MtEmber_Steam)], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(384)), 8 * TILE_SIZE_4BPP); } -static void sub_807029C(u16 timer) +static void TilesetAnim_MtEmber(u16 timer) { if (timer % 16 == 0) - sub_8070274(timer >> 4); + QueueAnimTiles_MtEmber_Steam(timer >> 4); } void InitTilesetAnim_MtEmber(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 256; - sSecondaryTilesetAnimCallback = sub_807029C; + sSecondaryTilesetAnimCallback = TilesetAnim_MtEmber; } -static void sub_80702DC(u16 timer) +static void QueueAnimTiles_VermilionGym_MotorizedDoor(u16 timer) { - u16 i = timer % NELEMS(gUnknown_83AC7C8); + u16 i = timer % NELEMS(sTilesetAnims_VermilionGym_MotorizedDoor); - AppendTilesetAnimToBuffer(gUnknown_83AC7C8[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(880)), 0xE0); + AppendTilesetAnimToBuffer(sTilesetAnims_VermilionGym_MotorizedDoor[i], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(368)), 7 * TILE_SIZE_4BPP); } -static void sub_8070304(u16 timer) +static void TilesetAnim_VermilionGym(u16 timer) { if (timer % 2 == 0) - sub_80702DC(timer >> 1); + QueueAnimTiles_VermilionGym_MotorizedDoor(timer >> 1); } void InitTilesetAnim_VermilionGym(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 240; - sSecondaryTilesetAnimCallback = sub_8070304; + sSecondaryTilesetAnimCallback = TilesetAnim_VermilionGym; } -static void sub_8070340(u16 timer) +static void QueueAnimTiles_CeladonGym_Flowers(u16 timer) { - u16 i = timer % NELEMS(gUnknown_83AC950); + u16 i = timer % NELEMS(sTilesetAnims_CeladonGym_Flowers); - AppendTilesetAnimToBuffer(gUnknown_83AC950[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(739)), 0x80); + AppendTilesetAnimToBuffer(sTilesetAnims_CeladonGym_Flowers[i], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(227)), 4 * TILE_SIZE_4BPP); } -static void sub_8070368(u16 timer) +static void TilesetAnim_CeladonGym(u16 timer) { if (timer % 16 == 0) - sub_8070340(timer >> 4); + QueueAnimTiles_CeladonGym_Flowers(timer >> 4); } void InitTilesetAnim_CeladonGym(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 256; - sSecondaryTilesetAnimCallback = sub_8070368; + sSecondaryTilesetAnimCallback = TilesetAnim_CeladonGym; } From ffb21d41b58f8c51006f656344c37cb43cf60f83 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 3 Jun 2021 12:43:17 -0400 Subject: [PATCH 2/5] Tileset anims to PNG --- graphics/tileset_anims/anim_0_0.bin | Bin 128 -> 0 bytes graphics/tileset_anims/anim_0_1.bin | Bin 128 -> 0 bytes graphics/tileset_anims/anim_0_2.bin | Bin 128 -> 0 bytes graphics/tileset_anims/anim_0_3.bin | Bin 128 -> 0 bytes graphics/tileset_anims/anim_0_4.bin | Bin 128 -> 0 bytes graphics/tileset_anims/anim_1_0.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/anim_1_1.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/anim_1_2.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/anim_1_3.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/anim_1_4.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/anim_1_5.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/anim_1_6.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/anim_1_7.bin | Bin 1504 -> 0 bytes graphics/tileset_anims/anim_2_0.bin | Bin 576 -> 0 bytes graphics/tileset_anims/anim_2_1.bin | Bin 576 -> 0 bytes graphics/tileset_anims/anim_2_2.bin | Bin 576 -> 0 bytes graphics/tileset_anims/anim_2_3.bin | Bin 576 -> 0 bytes graphics/tileset_anims/anim_2_4.bin | Bin 576 -> 0 bytes graphics/tileset_anims/anim_2_5.bin | Bin 576 -> 0 bytes graphics/tileset_anims/anim_2_6.bin | Bin 576 -> 0 bytes graphics/tileset_anims/anim_2_7.bin | Bin 576 -> 0 bytes graphics/tileset_anims/anim_3_0.bin | Bin 256 -> 0 bytes graphics/tileset_anims/anim_3_1.bin | Bin 256 -> 0 bytes graphics/tileset_anims/anim_3_2.bin | Bin 256 -> 0 bytes graphics/tileset_anims/anim_3_3.bin | Bin 256 -> 0 bytes graphics/tileset_anims/anim_3_4.bin | Bin 256 -> 0 bytes graphics/tileset_anims/anim_4_0.bin | 1 - graphics/tileset_anims/anim_4_1.bin | 1 - graphics/tileset_anims/anim_4_2.bin | 1 - graphics/tileset_anims/anim_4_3.bin | 1 - graphics/tileset_anims/anim_5_0.bin | Bin 256 -> 0 bytes graphics/tileset_anims/anim_5_1.bin | Bin 256 -> 0 bytes graphics/tileset_anims/anim_5_2.bin | Bin 256 -> 0 bytes graphics/tileset_anims/anim_5_3.bin | Bin 256 -> 0 bytes graphics/tileset_anims/anim_6_0.bin | Bin 224 -> 0 bytes graphics/tileset_anims/anim_6_1.bin | Bin 224 -> 0 bytes graphics/tileset_anims/anim_7_0.bin | Bin 128 -> 0 bytes graphics/tileset_anims/anim_7_1.bin | Bin 128 -> 0 bytes graphics/tileset_anims/anim_7_2.bin | Bin 128 -> 0 bytes .../anim_celadoncity_fountain_frame0.png | Bin 0 -> 191 bytes .../anim_celadoncity_fountain_frame1.png | Bin 0 -> 177 bytes .../anim_celadoncity_fountain_frame2.png | Bin 0 -> 209 bytes .../anim_celadoncity_fountain_frame3.png | Bin 0 -> 235 bytes .../anim_celadoncity_fountain_frame4.png | Bin 0 -> 219 bytes .../anim_celadongym_flowers_frame0.png | Bin 0 -> 171 bytes .../anim_celadongym_flowers_frame1.png | Bin 0 -> 171 bytes .../anim_celadongym_flowers_frame2.png | Bin 0 -> 157 bytes .../anim_general_flower_frame0.png | Bin 0 -> 166 bytes .../anim_general_flower_frame1.png | Bin 0 -> 165 bytes .../anim_general_flower_frame2.png | Bin 0 -> 162 bytes .../anim_general_flower_frame3.png | Bin 0 -> 162 bytes .../anim_general_flower_frame4.png | Bin 0 -> 163 bytes .../anim_general_sandwatersedge_frame0.png | Bin 0 -> 407 bytes .../anim_general_sandwatersedge_frame1.png | Bin 0 -> 419 bytes .../anim_general_sandwatersedge_frame2.png | Bin 0 -> 434 bytes .../anim_general_sandwatersedge_frame3.png | Bin 0 -> 460 bytes .../anim_general_sandwatersedge_frame4.png | Bin 0 -> 444 bytes .../anim_general_sandwatersedge_frame5.png | Bin 0 -> 448 bytes .../anim_general_sandwatersedge_frame6.png | Bin 0 -> 445 bytes .../anim_general_sandwatersedge_frame7.png | Bin 0 -> 408 bytes ...al_water_current_landwatersedge_frame0.png | Bin 0 -> 577 bytes ...al_water_current_landwatersedge_frame1.png | Bin 0 -> 586 bytes ...al_water_current_landwatersedge_frame2.png | Bin 0 -> 767 bytes ...al_water_current_landwatersedge_frame3.png | Bin 0 -> 783 bytes ...al_water_current_landwatersedge_frame4.png | Bin 0 -> 831 bytes ...al_water_current_landwatersedge_frame5.png | Bin 0 -> 856 bytes ...al_water_current_landwatersedge_frame6.png | Bin 0 -> 811 bytes ...al_water_current_landwatersedge_frame7.png | Bin 0 -> 748 bytes .../anim_mtember_steam_frame0.png | Bin 0 -> 175 bytes .../anim_mtember_steam_frame1.png | Bin 0 -> 171 bytes .../anim_mtember_steam_frame2.png | Bin 0 -> 173 bytes .../anim_mtember_steam_frame3.png | Bin 0 -> 171 bytes .../anim_silphco_fountain_frame0.png | Bin 0 -> 222 bytes .../anim_silphco_fountain_frame1.png | Bin 0 -> 208 bytes .../anim_silphco_fountain_frame2.png | Bin 0 -> 213 bytes .../anim_silphco_fountain_frame3.png | Bin 0 -> 204 bytes ...anim_vermiliongym_motorizeddoor_frame0.png | Bin 0 -> 138 bytes ...anim_vermiliongym_motorizeddoor_frame1.png | Bin 0 -> 146 bytes graphics_file_rules.mk | 4 + src/tileset_anims.c | 78 +++++++++--------- 80 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 graphics/tileset_anims/anim_0_0.bin delete mode 100644 graphics/tileset_anims/anim_0_1.bin delete mode 100644 graphics/tileset_anims/anim_0_2.bin delete mode 100644 graphics/tileset_anims/anim_0_3.bin delete mode 100644 graphics/tileset_anims/anim_0_4.bin delete mode 100644 graphics/tileset_anims/anim_1_0.bin delete mode 100644 graphics/tileset_anims/anim_1_1.bin delete mode 100644 graphics/tileset_anims/anim_1_2.bin delete mode 100644 graphics/tileset_anims/anim_1_3.bin delete mode 100644 graphics/tileset_anims/anim_1_4.bin delete mode 100644 graphics/tileset_anims/anim_1_5.bin delete mode 100644 graphics/tileset_anims/anim_1_6.bin delete mode 100644 graphics/tileset_anims/anim_1_7.bin delete mode 100644 graphics/tileset_anims/anim_2_0.bin delete mode 100644 graphics/tileset_anims/anim_2_1.bin delete mode 100644 graphics/tileset_anims/anim_2_2.bin delete mode 100644 graphics/tileset_anims/anim_2_3.bin delete mode 100644 graphics/tileset_anims/anim_2_4.bin delete mode 100644 graphics/tileset_anims/anim_2_5.bin delete mode 100644 graphics/tileset_anims/anim_2_6.bin delete mode 100644 graphics/tileset_anims/anim_2_7.bin delete mode 100644 graphics/tileset_anims/anim_3_0.bin delete mode 100644 graphics/tileset_anims/anim_3_1.bin delete mode 100644 graphics/tileset_anims/anim_3_2.bin delete mode 100644 graphics/tileset_anims/anim_3_3.bin delete mode 100644 graphics/tileset_anims/anim_3_4.bin delete mode 100644 graphics/tileset_anims/anim_4_0.bin delete mode 100644 graphics/tileset_anims/anim_4_1.bin delete mode 100644 graphics/tileset_anims/anim_4_2.bin delete mode 100644 graphics/tileset_anims/anim_4_3.bin delete mode 100644 graphics/tileset_anims/anim_5_0.bin delete mode 100644 graphics/tileset_anims/anim_5_1.bin delete mode 100644 graphics/tileset_anims/anim_5_2.bin delete mode 100644 graphics/tileset_anims/anim_5_3.bin delete mode 100644 graphics/tileset_anims/anim_6_0.bin delete mode 100644 graphics/tileset_anims/anim_6_1.bin delete mode 100644 graphics/tileset_anims/anim_7_0.bin delete mode 100644 graphics/tileset_anims/anim_7_1.bin delete mode 100644 graphics/tileset_anims/anim_7_2.bin create mode 100644 graphics/tileset_anims/anim_celadoncity_fountain_frame0.png create mode 100644 graphics/tileset_anims/anim_celadoncity_fountain_frame1.png create mode 100644 graphics/tileset_anims/anim_celadoncity_fountain_frame2.png create mode 100644 graphics/tileset_anims/anim_celadoncity_fountain_frame3.png create mode 100644 graphics/tileset_anims/anim_celadoncity_fountain_frame4.png create mode 100644 graphics/tileset_anims/anim_celadongym_flowers_frame0.png create mode 100644 graphics/tileset_anims/anim_celadongym_flowers_frame1.png create mode 100644 graphics/tileset_anims/anim_celadongym_flowers_frame2.png create mode 100644 graphics/tileset_anims/anim_general_flower_frame0.png create mode 100644 graphics/tileset_anims/anim_general_flower_frame1.png create mode 100644 graphics/tileset_anims/anim_general_flower_frame2.png create mode 100644 graphics/tileset_anims/anim_general_flower_frame3.png create mode 100644 graphics/tileset_anims/anim_general_flower_frame4.png create mode 100644 graphics/tileset_anims/anim_general_sandwatersedge_frame0.png create mode 100644 graphics/tileset_anims/anim_general_sandwatersedge_frame1.png create mode 100644 graphics/tileset_anims/anim_general_sandwatersedge_frame2.png create mode 100644 graphics/tileset_anims/anim_general_sandwatersedge_frame3.png create mode 100644 graphics/tileset_anims/anim_general_sandwatersedge_frame4.png create mode 100644 graphics/tileset_anims/anim_general_sandwatersedge_frame5.png create mode 100644 graphics/tileset_anims/anim_general_sandwatersedge_frame6.png create mode 100644 graphics/tileset_anims/anim_general_sandwatersedge_frame7.png create mode 100644 graphics/tileset_anims/anim_general_water_current_landwatersedge_frame0.png create mode 100644 graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png create mode 100644 graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png create mode 100644 graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png create mode 100644 graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.png create mode 100644 graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png create mode 100644 graphics/tileset_anims/anim_general_water_current_landwatersedge_frame6.png create mode 100644 graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.png create mode 100644 graphics/tileset_anims/anim_mtember_steam_frame0.png create mode 100644 graphics/tileset_anims/anim_mtember_steam_frame1.png create mode 100644 graphics/tileset_anims/anim_mtember_steam_frame2.png create mode 100644 graphics/tileset_anims/anim_mtember_steam_frame3.png create mode 100644 graphics/tileset_anims/anim_silphco_fountain_frame0.png create mode 100644 graphics/tileset_anims/anim_silphco_fountain_frame1.png create mode 100644 graphics/tileset_anims/anim_silphco_fountain_frame2.png create mode 100644 graphics/tileset_anims/anim_silphco_fountain_frame3.png create mode 100644 graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame0.png create mode 100644 graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png diff --git a/graphics/tileset_anims/anim_0_0.bin b/graphics/tileset_anims/anim_0_0.bin deleted file mode 100644 index 38ac085bdceedcd705047b83966d6844443fa468..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmXYpp$)(=3`RDq6Z~&`0h~e1a3}VOc|L(#2)iNIq)nSP1wLd4Wy#677u6$L zO3WfW>z_CUBsuI+kT+EjvG3vXHIVs^aaW*qz|&C_b~~x(vj(COMs2P2W!U@$8BjGY diff --git a/graphics/tileset_anims/anim_0_2.bin b/graphics/tileset_anims/anim_0_2.bin deleted file mode 100644 index 8bfe63cd213b09535d4f810aadba6d172b7d0dc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZ9EAr8PG5Cm7$A^If*4srj37r+?=hP!Xn^9d}WRA9QvWHZ@hfsp~L5rr5V1w^qMs^)bf07CF4O^D@u? diff --git a/graphics/tileset_anims/anim_0_3.bin b/graphics/tileset_anims/anim_0_3.bin deleted file mode 100644 index 13522349b7ec248a69c495358410cd212abc776d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmX|(u?fI15Cc`D`ywm3_|Apr^9rBFg)3`~^j_jy<9r}Qa3DA#;1AJgxJFRfSVyyK w{5FbwunAse)g(3qdrqr(nnj_yuB1kGjRX_ diff --git a/graphics/tileset_anims/anim_1_0.bin b/graphics/tileset_anims/anim_1_0.bin deleted file mode 100644 index fb05bd03cb4351f3431903e21e87760c1c7fe012..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmcIkzi-n(7`+Zu2o}7St^a~|I<$X47CS3Tu1mJkddU#Bk7QxAVPbQQgw(CgF{eX6 ziND~=j+9$iq2WC{rfvX5Ldw& z%NRJyvZJmH@s>Ko@AvxMpZN}KumRP$G447kSlrA zR6gsU9%q9z>sxy|m=9B{YUip$9bKztnQmKW4c1~!*5(;_7M_WP`t!9I{Vi{qf ziEp7J8q~I}tHnDG)9e~XMgyc>o7A?fF9}tQ6`WJo!6vy3lQ%B diff --git a/graphics/tileset_anims/anim_1_1.bin b/graphics/tileset_anims/anim_1_1.bin deleted file mode 100644 index d67987eca9a5a72d635e9370f1a70e550da37bf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmcIjy>8nu5M~M_Lpw23kRhEW_$8})N1} zSt8dGcLY5ieXYmIY#3`qJwqJg=^bL4;&FdGNRv3-w9Yel7SH6_yarwiuZd@GTJLK- zPG*>DJnhqm&4g_>SlhHdK>9}<#^XEGF&jj-*<@|gdbI#n6$ThY6R=JXd8=P#jAE?D zgCBIxxmD`^H{zqS)|Jkcj4x&R!x7f$bGp-v@7DhMSyd1GANPp2SH^U>mhSwwf9Wz{ k0*weVz@BVOSP4q%!!tnxSpWb4 diff --git a/graphics/tileset_anims/anim_1_2.bin b/graphics/tileset_anims/anim_1_2.bin deleted file mode 100644 index 813f9391438104e3cd62dd63de4b822394e57004..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmbu9zi-n}5XT=#6bY6-kL?t%C=-7Hs7tplw%05^FIig2K1Ip`(<5Ez7Q@7r8i|== z=6L9nkl0;zB=Q%4%J(jD45d;BPWjr;_qn_GDo#y+RUb9V3}>nn9ePOu=x(NQxt)_WIly=gdpzcAcBQD9ek5o7anZ{l0o+ z%xtmN`J3`_?c9@7=k}fZ7`XD2wFo(@+~VELIXj!b+J(~ucCfCCstdPQ&D>t?=BK5* zxNocddryNcHtoiSVb})NhSu7F4Fe1Y!2$C@$J;Rc3OGOvu0n07d}yB|5gHu#vL~(h zhrzS8H0Gq|5-VJFi2Gq1+6kte1omuVZ8<5+GDCgZ&c7WD!xq798=OJqdY?yRj-tq* ze+Gv>LjTsvNI304xZu!Dl#)R=cPNG^-5H^OBlK^C{vn7VG9w5V%|#5_55*7AKZE`m zDjsT0;f41EjXgKsGy5XRGtOg93d++WiwS%weEJ7Z!SULq%Q1KZ&fqA(%$mR9neslr zL4DTxEcq%JOZ!vAcK|ck}L1N9?A*d+zwp>+3HbE4cLjbGR`KF0Z`* zv4Y*jtJSI!`%qQiC0-1P`n7#)+h4cwcD1^a0O2;2zYJ>~ez)0O{GS{xg@ULn+qs47 Ld>xl>@PF(#&;!qN diff --git a/graphics/tileset_anims/anim_1_3.bin b/graphics/tileset_anims/anim_1_3.bin deleted file mode 100644 index df560357cc9924b4fe26977a8f47f22397950701..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmbu9zi!k(5XPN?L!x4r<`m>&U6GD(B~_#}*U{K+-FVzwh2mYECxuDa^wVn-DgmFoi;p zOGQ|TQqEzA5JLvy;LgF)8*fDHaxj!3!NhPh;-k=TZLhQUr=Dl+%R_6QS$lj~RbR2J zUo6+3R!=-{ankGbL-l%X?ellmj;;M7ZS_qEgp@0LQZB5Oi{qoGDiEF&s;`TxCw6i-UvBuRL~2)k3D8xjFj+~(?*ngjZ#?E6i3e$YDl#_ zK<$I7+Rsp*y7Rk>IPV)(XjTTu*=>9^>F+ZkFCp?UKM(VJgZU+xUxJY^rx8Stpb&~6 z8es|}jAN8wehJ2wV159GVOI+m&c*yjl=i~>Jj~A{{kW^iyeMi{7~^!DXC{kG98;d^ zSww}SO;OJrxEpv1PT(7G2kzXx9GQP{6hM8$`G)g#FG}lK6lav1I5OJg8K22#a|~jM z&*ZZWdf;BKcnxmA3$#w=IljA7Zsr3_tSuUT?lvf<=ZDNDC&Sb!`&HnuiM zNNj+a z3{@<{p2EvfR3Pj{DC3Jki~$H~L<*c7I3I*R+#+x4GvwZhg=91fnH`Y0ZoQUg1qVF&ARJ( zN8S;6BgBjqVrC5arf*J~LY&lnaaQ+d1)5^^yy>@|*M?&?E&FRUwC1lmNmdG!Q&!&a@PqTkae7K6eMa8Dtrv1!D1LnYvsb)p`B#bDrHqP zij@MdV(<$5BwhgEGw^CmzS1YqC(s9(9d;AwgCqlw&oAu2{}}%5O@FI`1YQ%)Nsepa zTIfmdjB8MtU8oGa0zZi&Ii@Fhk~YIyG24)Ha}D@@N1X(Gki=Xg{JZe)!oR)gU-l1E zG&WdRMKEVFM#2ZB7B*5Dcuc#P;MIf)dXrcKc+^spKuZMJoemPrU(|r_g72cNv+0lB zO6)L1hv=CJz`RH$`UklG8TKE|f}cd09haq)u%^<}hzKC+qJQjvT-kQuc??l|)Bm1f zEv_ok)TV#LHhxu#@7|=iRzWvvSI__A=ZN?7`S)cNKbFhl7xOL8fBn3_|GLTN%jF#l yRy-!LH`adfsz7pcXDw`&%Q>!Xyyv>O5XE1Y{wucen*#bUsAFv7%U|LDkG}z+IKr<0 diff --git a/graphics/tileset_anims/anim_1_5.bin b/graphics/tileset_anims/anim_1_5.bin deleted file mode 100644 index 4e5e0e24725efeb9c34bfcdecf7c00bf1fecded7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmbVMF>ljQ5Pl$<0hXo{f(bKrsMM&fki6NdRjC6@>@|xoiwB06JVnYKh6@--NpjPZLo9 ztt2K-$F%J?iM%F^C??Wa1W}VZy4i$D^9KNuRVZrIfFX*_k( zOYx2Ir$sTDl_gvtj`P#mYzY2LTq?ZW+?#G3@69$&dRKbfo0Z3V(@Pb5wt>BCJ`!^s zFM*ZLNzZAdJy4r8?X|&AlS)toDv&~^sB(%br{!iUI`6X;suvV0%uiu{EsO_BqJqaY zrJ7Vzn4iM@6y{gM{A!rr%5(TU$Jkl|VtxwqQ!R>>YC)C4{8li(70j=O`6N`MJ8k%zCAZWdwJhUNV>bXE07vxL)d{(p;$1&NZ>XQU?J*nQ^dsbt=lT1{&lPsn ze;@sut(;A)xgP~E4BC)*@g?lxC1x!4G9Es00DRv>V;8uK&(YNp@`K+qZAK4#b^emS zlS{QpC|H|4ZP@j(=Y=pL06M?we-RIyfa6d&5qlXgXN2?b1UZE}IJ6y|baphEeLn)X zslE$57{7&N%-KS2!xw%x-%ge}A~*LJ>jf@8XO43|W4G>as$TlVMRGd L9cTU({{Qn2ty|Ks diff --git a/graphics/tileset_anims/anim_1_6.bin b/graphics/tileset_anims/anim_1_6.bin deleted file mode 100644 index bb716829f5946da5374ea079c2d21b0b165fa666..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmbW1F;Ck-6vvNB&CpI^WI|?SK;knTiI6fd5NFL`pBImDPDl)8JHpa3#pMeGSE@v( zf;(Etz?1q3O!rE-U!aZqf0sB(Arexb{CAG~-TU9WdooJ-N~t#F`W_@bx2^h3Ot?)5 zzaE%`8r8sNaMm$|;ACrH2Maq!zB<5U)NZSG2QOBD=|&|_2^;UPg)m0EGiKYE;aMEt zj?6F}4bxA_8zBaxnXW&^Z&PD-FO0$Sb<@Om^*WY(NX+PFV9d>6c)ocR-)*0rJ7U|} zU~4lnTgkv|rDk}Mn%h@#l5UtUyF%107CA>zJQQX5t3)_>b{uCvMo6tCL0GObA-M}dyC?kJ`Gap)?_z$JJyBiv`d1Ma)b zqrmcIJ~*v%&hNt?3Q13B!4Ht%P?6v8TwcRo?Ae32>}jG?O{hsLP+PvtXST{``M7`f$Nh&L3?OxY{3eC4RQyepM0n@a5yI;dZ}@&%VO{fByw)y84R% diff --git a/graphics/tileset_anims/anim_1_7.bin b/graphics/tileset_anims/anim_1_7.bin deleted file mode 100644 index c49e57e7fcd915118d0818195435144d3f3f6f4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1504 zcma)5v2NQi5M_osMZ45nkZ$<}eSnAL7ep-@yog#f6fkHm9-NJ}myUKjb#qjpK(@r{ zYJ2GYg7N_YtfhO@ca#_?ZqoKaPdf44J@Q0RDj;bY;wcklK&2zZVX8F7#ypKa#F4}zc$fD2vDrMk(f3kMp}=UzJ#8xqkrb0T{R@#8BZ<0^e6)?>>M-?B5Xk z$GYl)@>t;OgA!CdPvmGY9Aa05qYRxFdvYyuu}wW#_ppBg`zONil~Bj53PF<{kufxm zbZQc5@YiUw&7{&hwWT;A?R5iPLzgCDod`N*sE-fp4|LkVU$_4F`E44RX;l61jF9Nshbq9CviJf!^A<;n?f$Yp0Y+^nwrW0=yW+ z8T!W=-YB$^jiE~{mIpZ*Li0!wrZLCedX76fVaWue-2{WonDq!YCM7;E37o|^k)YSNHRsyH?`iH=j&vGEwKe~AsoVvOPH zHbjqVdrorYrjo)|h5e{6h_dRy^0mCQ zB6$u(*4I*Qd+%tus-;?IBCD);9=w&?#mZXj8Ti#w$*|63Xr;)lY;s%Mo^0(o4W8PU zUALOXHK>tN-wHKm9(QAepFT(U^_TBMx4ZMqPjI;J@-N3sH+P5mrcrb3Pm~HD@V+^D z|8QuW+wGleMwnOaPf(=kku|{|!QTx2X7D$IKcDLW#C?LSBXJ*E0%!>$_>15#f@6Ze b795BoKm>mQ)CKStz#qXMne>cI-={=B9U%xY diff --git a/graphics/tileset_anims/anim_2_1.bin b/graphics/tileset_anims/anim_2_1.bin deleted file mode 100644 index 74424fff906233f1648a92efdffc3a2732a64675..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 576 zcmaixu}T9$5QZm063}W>T7+aRZ6pzF#e`gIv!u1Tu?@L!gPnHc*(f%5`U01;ij~Pd z%RNHw8T{{}pddKxH?TWD|HAyvXLgQxiYCsv1=>ia?rZ@9aiPeRMT93JK6?wuJ;+1A zuDU=R4n@M#Kzwhw@I!Cpb69D(1|rz{@OPEJpat;v04yEV^|&NbrCZgWYJ8U@>r~@B zjq|r`pD0RqEMJm?T=n=t73ZU)$;KE+o-$2Wk?Jan?>n!_rgwL5sb?FNwWfNQMS7TP z{E+K)@|z()LVkq&=qmJx;E6(XE!Z}ZUlZ0;MHWb#Ja|_136Od3{r~^~ diff --git a/graphics/tileset_anims/anim_2_2.bin b/graphics/tileset_anims/anim_2_2.bin deleted file mode 100644 index 7b2e609c3e7432b123d8f514458b9cbff8358780..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 576 zcmYL`F;fCD5QSHfVMZG^B~+Kzp*lud6$XdSCPPbeu|;6WT&dLxjdT|~yW{)=D*wX% z{);c1LT0{XFYjeDxo7R&+*;cM%YZS~8eO2(Pl2CN@cNRP{yITw29ST06CSu=CQTA_#(o-z2>ORaw(M(|(`D(k)8;aeO8(c=-Gm0`c5ZYuVk z*-;PPpzj%B9hI6>T$?K1q|83`-anwfJ=}jNI=Y0pEY$}1>YbAwP3)48A0fYc{NQN- z*#zA+h!&WTA0a~ zK)<3NkbmJOL0G!+v+wh@qmvAs%aVn&Hh~_XEVb6A1`A_m7RsiWr^Z-U2@8k9p-55` zf8L)z!!|r)7ARu)wx2qi4UyYNZhtYe$qUQxb)h3B#k$Ew>Q*}YwR8@$5ihF~ z{%D`X>ffdkBV;Z);%aEEIP!T{=f3bG=SG!}h9jdvp&??eRMCxn*XOm*y>ZC5gHT1w zQ02>z^XHQFvSc+bb<_xTh`q|Idz3<5j7!c3rPi4B7*{VfGL$Y-WT)Pbo{(?r`|A%M zn}=#VRz*0|D?=SO|2cQ`m^cDI0>4M_n}FX0Y$|^mKqeqyAz&f!3BWG^zo6=wfNLcJ d5HuQ^Lo|VifUO07EwDR<2>i&*&Iob!_ywSZyhZ>3 diff --git a/graphics/tileset_anims/anim_2_4.bin b/graphics/tileset_anims/anim_2_4.bin deleted file mode 100644 index c350f70ec2bb5eb92cbc50d4a61397a47b38d67a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 576 zcmX|;u};G<5QYz-bbtkCLLi2kg(U+yB-FVTh^>po+Qnu?qKeg#?I;V7rN_or%ESir zE!gue{BBAueX-;J?xN_6*UpWjbBsqE#OrVYs&Nb<5u*#|edjB7KA%QSzC`TZCwjy{}?X|^5kXtvDhJ+ z&RgDJb$2Op_$ab3@|BDJ7=x1Mh0H&vBKdUou-CPQa?@?+V(MHD7E?J`%1l%qw#?i9 z7U!Fo8vEN=)BP=NX&I}>ti4)Uwa0@P2Tfs{A~)6^+vAigbDb)Q%vfm6trp z%X&q@^<7c+`puejPIv!#s!ctq_Xu=>t#yKrPP8RryTSa>Y?iUj5p#2@x}j8U|8wZ* zHadbog1-^`jo@zte<^nv@EwA(HNFEa9camh@Hd28fN%|7h=xA(!e0h|8T@7NNAO3X K+NRJ+DbXKtYsC`) diff --git a/graphics/tileset_anims/anim_2_5.bin b/graphics/tileset_anims/anim_2_5.bin deleted file mode 100644 index 71636ac22733f66d1443c732635b7fcea95682c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 576 zcmYk3u};G<5QYzmS_zh>BTSf)p;A)`u^|-^bz`x*c8OUlwX&5FrlTxSmY639Wn!cB zS;`wENIXEz@1%mB^q*qi<vfhWJ~5q1-o#$4t_v06Ka7K9K#q7(Z1xo;`! zuG7!kv;MmMocwE+tlg}iZ{(lXZQO13_;gcNHv~TdKLS4* bDose<8~o}(R|mg3tO@+6XBu?2SAF>xcIfnX diff --git a/graphics/tileset_anims/anim_2_6.bin b/graphics/tileset_anims/anim_2_6.bin deleted file mode 100644 index 79e125e620fd72ac258dac222e765a443e6e9d4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 576 zcmZvZF;Buk7=}MI*hD87naD9RU?`E51cG66xv;wQT$@0+u*voTi!$}}4-}km68c-} zKcN1Dp6@|oV)RR&=Ig!JyK5h%`rQD?VB$*|v_Kp5wG5OVI;7NE$}yTTny%JEzo&J} z?`qZa@gx<774l$&<_3-GjkKDyv{LP{Qnw?82231MDkZT2mJHn5bgZW}5i>n9SDB-k zF}s+fB#x4|%_Y$yKCyl=R|#`{$&Blx%w}IIVaoG{&G~gj+oGtmF3dag>yB5aBJP3usDKFZWO0(ZSS-25nyrm z{2#WB#tXmjj{oBw)Wfeh8Kz!#OII*tpp=td|WDGpzx0xvr{x&84YJ^U+)q<@FDn z*XqhJ7X@J6-Eegny`$y2;d+-dZ}akb`c@s*TVpV1>PB3*IP{1N;`@E5^f1b;4Hc|dvuEd(tD pKOX#f@aLf?11f?$a=;%wqLCs%1b-9wo4_Af68wQN$+1g`z5z6w3flkx diff --git a/graphics/tileset_anims/anim_3_0.bin b/graphics/tileset_anims/anim_3_0.bin deleted file mode 100644 index 6a911444bd920cb82b90611400bb5fb99c8d8614..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZw8F%E+;3DDy9Ye+ z@vZKEL+}O+o^p#Qzcxx<6UpJsP0ZRw;e6)U7qW}G e-BcP6wTKi`vEFnt#`ha;bH8Ikt*VVCX3HNV#9*ZW diff --git a/graphics/tileset_anims/anim_3_1.bin b/graphics/tileset_anims/anim_3_1.bin deleted file mode 100644 index a66f3382d899a2175db06691bb7152274845148b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZvUu?@md3`D=gLP+jH)`&OorAZyrP~#$7(79!VNGQc0ii<>=@bC2O;?6FmC6TMV za(6o|B|EufN9WB`M#!qRPKr9I)e!^1j=wYUkW}jh_UYB;I$*B&ar72;qruVR-bkGJ VySejEI0;`k&VAq+aE8pN?F*qNVj=(l diff --git a/graphics/tileset_anims/anim_3_2.bin b/graphics/tileset_anims/anim_3_2.bin deleted file mode 100644 index ed7890e8380dc17810174b6b419f1da2edf61f06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZvUAritc5JfY?2_g#DU}jyR$JnAP@}nvcB;0_A-U7FlBVa1lF;myOupl%2fBu^H z_dB;Gq9Z-!=WXhow6v4fET>gy1bu+_2x#b`4Ay;s9vJIO1RV*Mj)3Ki(El;|LD5`Q rFP=3vev04{fjaDO>W5@MX$DfMQ}@f=HcGaXJlU!Hz@s1=G-jH=$uVF9 diff --git a/graphics/tileset_anims/anim_3_3.bin b/graphics/tileset_anims/anim_3_3.bin deleted file mode 100644 index 5cfdc3ebdd4f77d0af3f2b49154544bd9ec6b04d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZvRF$w}P6hs4_AVuyW{7&~0Tl{EanMt#jZY*rYU+5|9(t3miwaAu=#U94LjUem{ zZy0#SOoeDp*F1LG8j}|^%L{E@QYK2&C3FY)(jb(mZ1rydy5*dRGEzkWkIJJhBLVLM zyvpDM1_W*bcwGY@8z8P`Sy?O5S@_ViN6+wgz#ZZ3g$W~n8 diff --git a/graphics/tileset_anims/anim_3_4.bin b/graphics/tileset_anims/anim_3_4.bin deleted file mode 100644 index 83dc605ff43917230672b6fd3e3f4e20720d5481..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZw8Aritc5Czc8aDs~BxC1lm+Fl|iC4-1xV=UN6*UN$8t%dm2oT+! zmrZ7WoSQ3=wOlRt{MI?EWMLKCYB7-{eL{ah7!Qc!{v&WgYO^F_NR33?nt=0|MFQna z){_3)@Vy1=o8ufve@?tVRF5HQ3~|~4Q^`Lo51qFCpTXPN(62>t+d1&e0UNXG9*!8X@0#+WpNa9{}Z=;;YfPi!@M Ow*Im(Q{l=2JftsfTr5NY diff --git a/graphics/tileset_anims/anim_5_1.bin b/graphics/tileset_anims/anim_5_1.bin deleted file mode 100644 index f1a93897e2f28192cfa7b1da874f5580803a0ce9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZXO(G3GJ2tz#p*?%1mz)1{1cIhLR_NPb)u#G{IB_$c;^fw}8w+#`GvaDJoc>@-D z`h4UnREyytgWm84-LTDWbjfREf5$-1CH^oOQ^%9~hB=s7%3f*=7d{>;(Hmoss{}s# PXP&P%$d{eJvH8s({s=R* diff --git a/graphics/tileset_anims/anim_5_2.bin b/graphics/tileset_anims/anim_5_2.bin deleted file mode 100644 index d63cdc5fcca2da5b8ab7500e3968e1074531c8aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmY+9iw(mt2t;oH*ngcHfJzy_-lgvxMQM=*#`pMG`m>VCl1Ew>O8=^bI=Cp^rG1O= zLb(zjp4=xd_<_IRImZfW0zdTq9Pjs<%%{S%qEFdOT-(*%X5100hIJRfhEK=zh?IC{ RQlUN8XS&C1!r*)^_665-EJOeR diff --git a/graphics/tileset_anims/anim_5_3.bin b/graphics/tileset_anims/anim_5_3.bin deleted file mode 100644 index 0c396ccbe61223d363bb3ca879feab98661d351b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmYL@i4DLo2m?I;*?%1mK&1?j?9zkuvDBjA59x(1MM~!DInO-2Ba}InYiRAMF@`Wm ziQWq>i^iAJ@8G}vv&4v)PmKjubPDD~G670^by{3_tT{?@P&vh6z2sT9R$p&w`@p;U NVHe)uOh0G7Wj9VHGqnH! diff --git a/graphics/tileset_anims/anim_6_0.bin b/graphics/tileset_anims/anim_6_0.bin deleted file mode 100644 index 8bdac939e67c63ff39cc6b051e2fdc0b1cdfaa45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmZQzzzJ9x7y`m@$`UIPkebGjnwG+l>gE#Q=HddP!F-T7(EL!KIccGxp=m(i0t6r$ V#0QDP0Ei0`hRLHz1Ko)m008>27lQx* diff --git a/graphics/tileset_anims/anim_6_1.bin b/graphics/tileset_anims/anim_6_1.bin deleted file mode 100644 index cd2e32723fba781eda31c6aafc4e2d161ab49f69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmaKm!3}^=2t#{uGX~&-6MVY=2)0r4JrJ7^ppTFOqYfZXWOJmCS%2_l&6SLBb==)E c;M1& diff --git a/graphics/tileset_anims/anim_7_0.bin b/graphics/tileset_anims/anim_7_0.bin deleted file mode 100644 index f94617c73505a157fdbe6cea964865aa73058997..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmXwwK?;K~6a@#0yBwwvvhx<=F1un*;{_6PfF|?;-35f8@(*RKbQs=dc<`qP#6Vdx zF$F%^7xDXDTat>niggM*D&`H|tv=nVc{!m>6=My09Wi>K&Gk)RMG8AUA4IQ^{z0!h GnmpzkQR7Gru!(~#}{{ubfCoVZ}c`5?(gYEzK)Z~>kA BAY%Xk diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame0.png b/graphics/tileset_anims/anim_celadoncity_fountain_frame0.png new file mode 100644 index 0000000000000000000000000000000000000000..8afacc21017f1fbc8a83009b51c95a79c06d01ba GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsWwj+#}J9By{9*F9ySnYeYkxx zm-++2OL5P2W9Gyxzfj5adrRZ9f;+M)3mudS*~-=GzkYo1u)5`c!q%?-w=T_lHwH8F zDpbwb+u@L=l*V%VS?8YKws}H38t-R;T;}QO=d#Wzp$PybrcJB> literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame1.png b/graphics/tileset_anims/anim_celadoncity_fountain_frame1.png new file mode 100644 index 0000000000000000000000000000000000000000..dbc8030952e6feeeed8e6c8ef6057d255d6dc3b9 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsR~aQ#}J9BYfo(CJ>($Za#6GW z57X&M-U@Ti#9BmHCCEV-AX+U+pw2H*$^QuikZuO(rJ_cZ9?+FG|xAU9_>u b@7pr|k2~k+q_{Apg52Wi>gTe~DWM4f*Dgb@ literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame2.png b/graphics/tileset_anims/anim_celadoncity_fountain_frame2.png new file mode 100644 index 0000000000000000000000000000000000000000..57049923c681e2cb5ea3dfe1b04e188c26ef599e GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsTrOwjv*3L*PhwPd&q%@HQ@Xt zKFzzLnG%iHVz+rDnkl$DI+p(D%6iwu!?zopr06?5i0{{R3 literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame3.png b/graphics/tileset_anims/anim_celadoncity_fountain_frame3.png new file mode 100644 index 0000000000000000000000000000000000000000..ca84cf9bfb3d97e92c4eef80fd233b6419867148 GIT binary patch literal 235 zcmV{n~4j z!|N0L2hk{=(h)7?fsPEc1kpm|P6QJ1UW6d6XZEF_opY#pS0XRC4t&m$S6__n>8O~n z=8|Koz0NXBxsEY#hN9*eIh?TVZKt_nm24-C;F>=n+w>I}|nb(py!>o+z_p^L9hHxd8<002ovPDHLkV1nS{VDkU~ literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame4.png b/graphics/tileset_anims/anim_celadoncity_fountain_frame4.png new file mode 100644 index 0000000000000000000000000000000000000000..a096093679eb22b39f21f4fc0926d7b208a37cc0 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsYRYHjv*3Ldrv9y9dZz8eONB$ z!^{*M=uy>jtI*a}`x(Ow*3P6bg@83LRcGz;+`-%@YRkxZCP>JKb^otP-#`3n`@dk? z!5UG3sn@@kHjW3~DtFW3Eo@+sj;_q{$8otpT*enV!HX?Kzn_q+qe z7Ai5kt6RDgUpDi*J9~WSc{XubaoaNQ4#^5x*Im17XXVKxrx_e&HRk$vWglZ&&pe(V SpS72OTB>AsjQ4fAF*N2%M5Q@+0TZ z{R*RwM6om*;UhoZh-H~xmOEkK&AT~@HEBlMvYFz{rL|^$-g>@lM*q&()To)Vs+1Nj zE6j>8^0pIbYH^zFi7wOh29q=2{{Lsx{t$Uh S^1xG&?F^o-elF{r5}E)L06rN2 literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_celadongym_flowers_frame1.png b/graphics/tileset_anims/anim_celadongym_flowers_frame1.png new file mode 100644 index 0000000000000000000000000000000000000000..5d1c493e38297f8542b9e0fa3d4ec93a2a4af676 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExMV>B>AsjQ4fAF*N2%NexkI|=Y z9%oXGpYOIgJd=z(dE<6UocJ+EY}TGraz{9Lz4h1)d(K`ubJ(G0a&b;yt0l8!eVU&c zw=Z+%_F1XZq_|SnSnhdM5M>nb>Wt*-!)DJLdrZ^)ZqAA1H>x}GZ*#nQ6}w6ONradHm2E$6agEX0|S4 zEM054=ai1A$O(($W2Y>1B{jA_JEJ+<__br!wK{>D~UZJ!(hve(nq&t;uc GLK6Tdt3G-F literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_flower_frame0.png b/graphics/tileset_anims/anim_general_flower_frame0.png new file mode 100644 index 0000000000000000000000000000000000000000..49c7ceaaf502d442a50023340d98b82ad862cad5 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExxt=bLAsjPJ&u-*BY{0{Epgl?~ z((&+~)goC(L`~!ccO*YtdS>P4&c&77aB5AEjM<>I_%DJ$UiI#FL!HlNZ0f==71j zWp?6V+XK(D)h)Z@fFV-vWZESYV+VQ!+^fBAK@;Mx literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_flower_frame2.png b/graphics/tileset_anims/anim_general_flower_frame2.png new file mode 100644 index 0000000000000000000000000000000000000000..5eb7401cf47f53b7f3b1fe0f52b3c1a0cbcfe165 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExnVv3=AsjP(&u-*Bpuod&KwQ@~ zEJ4EA*^$|2!kcv05|PNRz9xxD9)+cs{-2h3|FB(5ZbC1&ZtV$c-3itj9EpolG<{rV z_iM=dKUvb2w`Hz#$U_HsE1)IJCO0 z?qL7IH~n6=^LXUZTfIvA@@o|Dtlq)gSS~1XT7PxgSC2V-AAc~o|M6bhQ+n+k$Z}6t KKbLh*2~7a#A3h!c literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_flower_frame4.png b/graphics/tileset_anims/anim_general_flower_frame4.png new file mode 100644 index 0000000000000000000000000000000000000000..d4d826f6dbdde1eb4aff059eb97a201925976df5 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExS)MMAAsjP(&l>VIDDbdekbiVc z)xsySFu~Ek;kz>1a=y5(-i2XTj_}#*+uLhCvHf%L5%Z_a1-kOrd?t#Bn9ZNYaq-LR zX?ZGKGZjjgIe&j~?vqJ^j&Z20arW_s1aq-vFS;Lj6)s<7taF;RvC5~ahxg20knNtX KelF{r5}E)XaylUZ literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame0.png b/graphics/tileset_anims/anim_general_sandwatersedge_frame0.png new file mode 100644 index 0000000000000000000000000000000000000000..35cee12c46df40da7fd76b4c9c6795439fcb1180 GIT binary patch literal 407 zcmV;I0cie-P)Jmg)Aa$(&ApoafIz<7K=peu-^zFWAVVs zTf65K>+s=mI@s0ApS$ePFHBnvmiwSunJ^;^5VYnLS#xT6Ko1q0F2k%7f)8GVq zqR1zzVHpIiDp3`oy|`Q;jQk1(^&GihX;4UKc;%zfWO!*3`4m+dqK;3kXDp6`deHFK z*e^R7J=A!_K3ki7ZR{FSC>Qk~cwSiqFV8&@@+`|m$maK%2ot3yBJMhR68(VE>QN*x z75#$3`rBo}u5keAa{CnE<#T}&?=!pL^N9Dky<%9&KAJnT?;kW~t94)CLvrskxZD|B zwgx+w`v9Ng1GwA=*ty&X*tpzB*tpzBFfMm~$K}qjmE8MoXl#cT^#$^lN#>KHM}q(W N002ovPDHLkV1gtxxU2vG literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame2.png b/graphics/tileset_anims/anim_general_sandwatersedge_frame2.png new file mode 100644 index 0000000000000000000000000000000000000000..d6109731cf6abb969fe1c7c1cf33db778f450436 GIT binary patch literal 434 zcmV;j0ZsmiP)jyx8KXgpTx0TD1Bso6r3bQsKm)D33S z3d1EyKL$))G#cc9bPMOSls?KRpZQrsn&-$cozyJHAW)*UF3S@5>?BD5MXK`l9*6JZWcg!BAE+iMSO9$@Sih&2u-0Gvk%aTi5q>&~M9 zar~wGO!gi2uI_yx)Ex+QFX=nfy-#1E?m(#fV};?0zCzs{eBD=6hPsyyX~2(*CT>$` ca`d170N3blx_g|482|tP07*qoM6N<$f^t2=^Z)<= literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame3.png b/graphics/tileset_anims/anim_general_sandwatersedge_frame3.png new file mode 100644 index 0000000000000000000000000000000000000000..5e3aa58f8635be75690638663625de2e512481a5 GIT binary patch literal 460 zcmV;-0WT%me5t)}#rpve_0}5YD}SQG)AZzb)lYO8v-ke z#wDmO8V4<{%KZW8f=jV$Xj`W5p*=XWg^sN2@(bE#aupbP=5NQ5@cU$OHi5_le{Muh zUfY-WCbFK19OK5?cP~WFksR+mK6JAqv9BWH>}W1$@&*I1`9fhKGLyByFV?44PVezI z^fCTAzsKlfXnh!`>3aTyIUHm$8k5DJh%AaUpbee|w0%#89ah12s}_UptX@BYfx@h9kHF!S}Fs_mQ4E-KR2HXrF)SgWGHs9#!`(A?dC#=|18y>AuBN(w&fW zPe74B5hmRaP+fe*m~>~Kq&wk3MgFWqnYDfPpZ@_MD|&QPc;s3D0000C{ek{_`)IyK)~ym20g40000 z!A`eKJRj=xPIZwpWrb4cGG#Xt1tnW)F@jQ3OYbmIU2e}(qzt*% z8dp*i$ds*VXyvw`uaxZq4;aZ^435C%jAvTVy^#RddJ~nSEQ qxy|=D-x=28dtZjGb?^4ifBpuNOhOj@&*&lm0000tuU{!A_?tnFtNUCXi4A!NWj<_D^D9E9dwF+ z$U3u&e<~+8*v|Zus0qsswB2`&pnUt#3rei$wQmrvO)rb=6lo>jw z3DqC*u&*krnyj!{oECI@z#}%r$}U&d$&f(24a8x%7lmPr5ZDPI%Xbv~N#eRF?j@nN z0e-BpB;w${CCN~wV{Y nyzdMj;`>mBeri3mzwi77Xxlc}UwP5Z00000NkvXXu0mjft`W&* literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame7.png b/graphics/tileset_anims/anim_general_sandwatersedge_frame7.png new file mode 100644 index 0000000000000000000000000000000000000000..47916c696c5ddfe8a5e746d104e167d1d6c32d87 GIT binary patch literal 408 zcmV;J0cZY+P)7xV5C`ykfDGgj$g`McYZuaN?E>iwka+Csl1i+x7?_iV6^RZVBjLxO>IPfWQmO9! zZ3;|1>ExfzA2~SE&nwk5wI*F{)U;_BT>3+cJ*su-_Nb{VqZH6oFD;iCb!qqopyE@C zru%A>>dz z;^m#)y<67?f}&$wAPgfUg+w8eP7xSGWXvn44_Yg=MpD$L4U!QY(FJhwcl#G1imo$CBx4haC5hG@N-|%!OtCV zb9cbpX8`67xVg{B`nmHve(sDn?M9GH!+d00001r;P)ljA7=~ZL+M%w*)&ct$AYF%M?v-pHq?l~5wB`>qxsjoZlQm1vOV-#6D^eFmr1&p* zD`IoEM$N!+-}(I6A{9a+uk^@I?(Vzq97_l7QsmIyTFH=m>!fHU%Xg$;$#fvHq#h)t4Q3`r(#;OY$~Q+ckE(LH|1 z^H@#P2mG>+cx>frtdvyKA@0W0Pf}eBQNK<`GM4w)+)1fM@-yvRoBF45$Dkncc}jvH zvK%4s!9iI9W%xSR9fQR#b`p9Cf|4YlvwV%B z@X$WjGdplV=h3#Z>|W5AN3EA6kMwPpR+=x_lWikQZ1Wu{Sn@x_G+*106pd`js0G;< z)BB%q=BpWjG|y53bFEhd^2Hz{poP!`7D5aNh|_C9K%}W4_O?$a?G!KOa^8?za8o|U zzV^A9YeCqlg&^!=aZ11sq@C~-FXr-n?IZMRMnDX*l)$z9Ng(w@o$wSd?#lPHPZuFt zn)F0UK|uQalO#TnNg|0S)^H0>?1L9^{Ep~u36`+EK=?{|7DX=!yaJvRXkP|rLYxq& zd^$O)sxtydLWD%uA`XI>KvmZjf!YVPz3T`lpS=n1%)PifpSgGc{Ez$wqfq7P@{7gB P00000NkvXXu0mjfVFVNv literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png new file mode 100644 index 0000000000000000000000000000000000000000..a765897d9c3b5efd05ea9baf885203f8ba49488d GIT binary patch literal 586 zcmV-Q0=4~#P)9qr7r;oY74auPx(?0UE14pMRFe&s*6jx%xs9cZleJ6FOV`*-K0tTG09ywn zdSyXm>SZfxrO3RmeLe>nruwHm_7mT~*FNcx<`k_pw62VVl4nkIUQ1ew&RUWqbDbK= zy<{!Py;KHQg+@V%-WLVQ?cr!#ic*#QR_gF={2FVeCQ_*(mT`PAP-=j2`QXDf#uK@x z;(ZG%_aZe`@9>Lm(TL>dNGYi%1Cq&+R0ltB{VLv%Be}wQd1Tb(kd|1RRbf{}Sq2B8 z%fBQDLI#1g0RwA{Wniwp8U`0ha>3B3t?$f+^lrW}ET5Ub#5J`?l~R^b3y-SmaT3@o zmLApf<(TeURL`d=$qm<|X{2dhuqf{He8FnvEMtqa+?1y(X&s69+gGBUG2J;j8OCWWR8u3lO zvmf5oJnabjF?6lch!jFHkS-4uBc)+rTpHOnW|zTJAs#WPPK_`?6a*22$OX@%=naFw z1-vak{LFr>_Gj5Re;y)# Y098E&Ge@toz5oCK07*qoM6N<$f{4HjBme*a literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png new file mode 100644 index 0000000000000000000000000000000000000000..5673e4cdff9ad20d9a162a792735be92e83023a1 GIT binary patch literal 767 zcmVc+@FNBDSUMtQW1oNxel7dAklKS4{*)c4TT%8o3!>dJV0K7iiSwh znu-t!-O?c?1!iVg%- zUc_;K&HX5XeD_K3lsad)<7uB0xVbafxesvb=6>#=v0%qdpaR&rGuXL*fWgguVBonE z-16MtbJ1I0bZny*LMal%ydr_XwGhc#5TIZ|UA6@aux$`Ker;;iQj;xobFVHvwhi{cGWZZw?hvS-=~(JgkqEG(XX|JeC6ZEsPgK;;2#LQ{C4R9=&}~=3 zLlt}yEJhzXAKp$sSOy?4+bBkq4+kY5Mq>z9Y|Bbg3~;I%!1U%zd~>hwH^W7XTjJF z913y30_|gh1Fa8PuqVVm3nCwoMN!6r%m+NkvS+MmO@RFs#=bc)idU)hNzqEe^zXAWnCZfBBDRKY+002ovPDHLkV1hF#YEJ+F literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png new file mode 100644 index 0000000000000000000000000000000000000000..89276ad9f5f1552b121c26198de2f5b907c925a4 GIT binary patch literal 783 zcmV+q1MvKbP)f9Ek^rAK;p$uxlLAAS5Krb=qK4B(mtC9>Lr5_x4oN#UTZ1!SX*0V94h3<%#3m!}3eH}LbC^TSuk zGx)^$S;YBsxK5I{PdPsaJ8{y&yKQv9lb0HFbP)4X{u(;`iI)UR&Le)tp~BUb$5f% zuZPd>@VVD2NUD=d6PUgu*uE2(z7v?fU%+7dJ`hmfT?zUAVbRe>5TuM@LLdZVm>}~_ zMhPM-g{Vpad9F6-Z3C4I%c=-VPythlF$G1Ch6Q6Guu+HY>Qti+YKWY4P@|Fpb(ql+ zfQPM)d;qpYmAayN=4^=E2}KV||UcMu4-#Kz5RJU)XEqmE3iPE`o2Lx*zGp%UirSRM2;9+#Vp zDNG1T!NQXEWSbPHQUp5%EFVF-rBJ%fYCJwcIO(WS2R~DDJaqSCmZV6>&G>GN$9Dtg z7$uH2W{4PzC?Rq&L*n8OOS>=$?uO@LhJDZTeb3vQpOn8?og6kU;BnJDp@cog_9OB?G>)D~FgFZXPN*7I3!sx@e>M@mf$=vYM#rpkhz zCOw!|Fg0roCZ}l6bYdVPA{aBo24?g-*#Zr7w+Y6SiYMHCK8p+#6sa*?^f{sOK>Q~%N+9Huq99BYxqu=R-52!TgpJ5 zNm#Ydj)gqFf%|oq=ikn6pjhSWbhR!_ca9Bs*_G$jGY_(SeN|uO87#A9mR)9-kh*|w znhKGo3+OKBBDxC@f^rKXV6N1h1@)yk@s{1sP*2m7I>Tz2cIxTk6Tzax+5o3{8F(Y# z0DLQ#fIY550qYX7h3I%586y)NZ;$*4h9A_OKso3{2FQ!{mIPb>^me2M47WV@0fC*n z1sZn&cNPY4XXnmf=01R1J9h>%(hG*zKw-ySY=PNyVVdgrT{SZkZpi)RuR40i@%GR00eOpKC4=^)z8uT2R zI!Mo9$aSy*&6%l#fO8_MMFoir_@S>9Et#e&Y&aYAURYy(&$Sp;O}A`R#zJeg3868M z&C*v<0DE>buQ6FS~nO0-aB2mJ*s*S%=PtOTZ=&OWD|hAV3xbF8&IH3kZY=Sbx}4 zwWy-y0v@$mFIZ4>v4P!M>xt9q?Sh1J8TRf+qkESy28NI6&NILFQru`&o9tf*r(N z)}}?PR%@~7^Oa{T$X)PPG-uJr)5d>;s&dt<>Rx&N{Y(2#@CyWGGNVKlBKH6Q002ov JPDHLkV1iowfR+FN literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png new file mode 100644 index 0000000000000000000000000000000000000000..473f41e6dec717b757061407338e71173f970e7d GIT binary patch literal 856 zcmV-e1E>6nP)LHn@0_Hl8*s|SpS&O6_w}7)&|0UNo*0NMoQ+|ubUM;{0+X>y zM>qui>BPjD)_{u>Gh)z5JYpD{(FjH)WPvC_(70FkBU*z)XBJWfV|Qg6=#L`;Ix~VL zM(|>}MEHK(Xjzbw;ggid&%(#>OUkw{Sk$Ar`Uk&INKG+alrxDDg#|s zQOa|GJpTas^nIRRPICx3UacU+VyZDERN(TY0<#mSlx8Pof^zAiSuV|*1zh|AvjT7- zZ2;QJ+wsfAuv0F&LmwAS*V@Vv%5)go5tm>iYnJ z`;NeUU&4a>J|LjJGhpA}!cXoy0{8tbEV%CjSaRP{hx?AOpuWGehh}N{mthdhswyFhOOhQYKZbWAqR*(n-7&P($ll zM+0hj-Fn9Zff}N2td0<;hIM+$xX{TaY6S)qO~vQr2Nx@4{Rot(+y4bBd2~c#@ECh& z(!oQ?h9VnlV|)Z!wTC8Xo^9amurcGY)w*GwtUr!dWuf~Ly`nxs74@m&VAcA`aPYkF zqcYT~qMvFEG@js)-L8!2u?_)EWeHB<;#k*I3@nV>8BE4gb;CO7XKh14B=j&6R3G7` zN)-JXc8Y${5WhEY9&k88XWA~d^`Y&yK32yTigc)7xL6Mp>{m)dr`RtBnk34Rg(3c2s+l=wQ}*uYMn?@~fph%HKR=x>V&f#U>}5EKCq zg5U`yI7L9kE_JrSEduVj?n6p=1aO~nbEmsP>`=l--#?(-*q9e_3$7)`n>olL{u`{7 i*Js@=%iTBaU%_uj92vV5VjeO800000W6?cB%Gtv zbev}bn2c-4uPtDHnL9}HTp-Cuc@A<`fRDtyhnHpyNew795h{xCb5#-iJ~z- z)+ZmM_wc0kFwpt{?xW~{4X58y=$_^XbRJ}mfF zmbWa3TtHz=!2-W^+h-A!{Wg?+Xv5YS>)%lJ`M~CJ0`8|>LyI>0)EzZK(3XB~&it12 z6B)m?6;VHDvERCpeo&zKfmQX0c)_sZabFPFxf9sASFo~kzkrpUy8zFfLFR6O<}Sc< z|4KeGck;1wCwSy>bBSu@iq>tQQi$pbVWL!bqKYo4&bd;Z@fBPdqZHp^ah=A~Q5u6u zjWJnbV1#H$DP)sw5|hMdN)jIe=VQ(lDC?tuJ**FTm`m%Ej%Lm$n=KLx69P$Lk=o7K zYz}jKocftNL)9UmGF;SfVQC}gHrOZS#@NSjtKt(=(WZ^2F=@4DeY%sL^T8fn3##b| z)qF%LlhOTTw3!w<;|1MM#*5sKz=ZojPV;8NOL9CW2}~JydCDpAp<4uH>f;S?s%L$& zNzeIUkJ?CMg=tKUB}R1S*fiqpK=a8`~RlJim4XUZw@;d$}V z?#OI_q%N&bHyJx0s)_4ABPdnN#s&m|V!?3~?Xe(m@my$}n_6!HUa_F=26mKs$D+5w z#v0z0c#H5Jl$zDog`8fOLgTA+Ze|bqNBPQI|Bfasf-*C54(L8y9M{Y+R^WvdID5q%>e& z!JPwla%aa)m_M^iQh)_Wnccsi9Ewy}gtL}x3D~qyWPr-|$QDvEWCUzM*5wS` zsF4=JLSdO` zJ*CI_{A9|okiyvqS}cP%*F<&w3+aO{jk)Bc(U7h=0fPVs zgDcJ#L3RzU_qPMYMhCo@AtHt$`>6qPt<7k7z}Kq`8wTvh0_y$-o94;d3x+2i?K!~D z9pLBQ&>uhd3wrW%2l%-QxE8ns@N>VQ#?Ku(e(wH=s`?oYJ#Y4&vl_3Iaw|p37{y7O z++~~GWMs<1n9>=-**Kry!}X*nk$4YR)+%Lbt>SX6)P!|n))Jj!kNvu(c z4m9jabkt78z*{|tzb|GkYrxD+Gq(i(GI>G*k7P`|r ekUu@g>);>Aw!odVANmLY0000tXP>FL{dzycwnYaHg!n|R`@H10)zh*>Cm+QlDdq8Q{(n8ciKfIX{~!64 Yb@9Pt&az*)L_jX_boFyt=akR{06yHgdvK#fDED1+R~|t0!)o{LLZZ`$vhp7p|R3d>5}%Tz;+mIitPZ V$sH*Rp2>k+;pyt{b!yKvWSMtSwc z4xc<3{#>7MWrBKfX~N^2;QXgCrwdPB3bkzfvd=_&c0}jQ?alq)r`TBg$$!y)^j&!0 XnRCaSKfjn%0dj|@tDnm{r-UW|(U(H2 literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_mtember_steam_frame3.png b/graphics/tileset_anims/anim_mtember_steam_frame3.png new file mode 100644 index 0000000000000000000000000000000000000000..b4f607b5a5b7c4e36f5534d37485b15d2cd39117 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsUlAo#}J9Bsr?suk0|gsTXV}Q z1lcrvk5`v_u^>;w7@O1TaS?83{1OR1(K>Ppz literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame0.png b/graphics/tileset_anims/anim_silphco_fountain_frame0.png new file mode 100644 index 0000000000000000000000000000000000000000..c23f5886c7f0ff45127c4aee357c836620bdc162 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsimGSjv*3LL;E)J9Wvl?=@%&b z#Xj+>&fFg?+C}1OBBtK<>lbmypWLat%0l(i)0^q6cNI&fuf11zg->bkF(oF?^((eJ zOipamQrKbFG2tQG)ML>m!e+e{tFQk!vg%%!@vO+t-3xm^TWw`E+LD>WZT?-pcfQhz z&S;$!q5jEN?6R%|dG=`ilkd*@H~)!o{j=$lY*o{>-mYv=u~Tkr-*{lT%%Vai^`A_y Wid9yARJA(=a=53fpUXO@geCy+iC3=x literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame1.png b/graphics/tileset_anims/anim_silphco_fountain_frame1.png new file mode 100644 index 0000000000000000000000000000000000000000..d5e6d74663a8ef56f765fdae8196aebf2d22c57c GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsp+0Bjv*3LOZyG^nhkhd_Xia> z+*8d+PCh^diAiY@vbGb~d7GH#9iHO;2>w>#%M@gJh)UZLW}x)&O(oi5I1P&2N& z@m6z2pugsf1AgiHU=sf%8AYn}gXJEb{wUP_#$_MZo?Z8kTo%D?bFX;l`9KN~Lta;m4RpUXO@ GgeCy@VNE6g literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame2.png b/graphics/tileset_anims/anim_silphco_fountain_frame2.png new file mode 100644 index 0000000000000000000000000000000000000000..e578cfae7451656872de31e08d80350f4108a6df GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsX3l5jv*3LQ~M0L4jb^e)(55b zFJ$L96le97BP(#4-@zN+ec~r31&4WY<(_0d==?)bxyB)5om0Qvf|u%(*1bH)>6XSL ztXE#5E40(2%+N=PMWIK-X_b@y8m7<-J)v8}q|cPjxgI3`VePbydOUrzUwtcSob+Z< zo2OLH!dxc)x<#o^oIjN(Pu&=<^50V4^1qE;c#eE%S*P4inK@5+kLIiXeH*^L1ms>% LS3j3^P6&;{<&ma;M9Q8Dp+Y;2c{QnJNla=hgE!vgwZ3z|Ky>qjHEKsq7WPT5D{)jv*3LlYj8D@ciib>hS2g z&K|E5N_A`JocvJ#^vqm`q;Gj`@te!vw{1{JN{F1WceO)T`nssCU5RP}25;DyIJkAT mab3L-8gZrZs6ma(iCTuEHYes?-BIoYvc%KX&t;ucLK6T+fHQ^w literal 0 HcmV?d00001 diff --git a/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png b/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png new file mode 100644 index 0000000000000000000000000000000000000000..52a687e69fca906dcbf35b84720980c24950c056 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^96)Tr0wfp|-f{m1Qjwl6jv*3LTl)?94j6DS|NSq& z!@gl@@sabJmK^lF%Hw;wz-gN*bCi5eLD?1NwNm91MgPf1Cg`l_k=U@q+;Lsi%Xb Date: Thu, 3 Jun 2021 12:49:25 -0400 Subject: [PATCH 3/5] Revert BG_CHAR_ADDR replacements in tileset_anims.c --- src/tileset_anims.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/tileset_anims.c b/src/tileset_anims.c index bedd19445..abd0d80e1 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -207,17 +207,17 @@ static void _InitSecondaryTilesetAnimation(void) static void QueueAnimTiles_General_Flower(u16 timer) { - AppendTilesetAnimToBuffer(sTilesetAnims_General_Flower[timer % NELEMS(sTilesetAnims_General_Flower)], (u16 *)(BG_CHAR_ADDR(0) + TILE_OFFSET_4BPP(508)), 4 * TILE_SIZE_4BPP); + AppendTilesetAnimToBuffer(sTilesetAnims_General_Flower[timer % NELEMS(sTilesetAnims_General_Flower)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 4 * TILE_SIZE_4BPP); } static void QueueAnimTiles_General_Water_Current_LandWatersEdge(u16 timer) { - AppendTilesetAnimToBuffer(sTilesetAnims_General_Water_Current_LandWatersEdge[timer % NELEMS(sTilesetAnims_General_Water_Current_LandWatersEdge)], (u16 *)(BG_CHAR_ADDR(0) + TILE_OFFSET_4BPP(416)), 48 * TILE_SIZE_4BPP); + AppendTilesetAnimToBuffer(sTilesetAnims_General_Water_Current_LandWatersEdge[timer % NELEMS(sTilesetAnims_General_Water_Current_LandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 48 * TILE_SIZE_4BPP); } static void QueueAnimTiles_General_SandWatersEdge(u16 timer) { - AppendTilesetAnimToBuffer(sTilesetAnims_General_SandWatersEdge[timer % NELEMS(sTilesetAnims_General_SandWatersEdge)], (u16 *)(BG_CHAR_ADDR(0) + TILE_OFFSET_4BPP(464)), 18 * TILE_SIZE_4BPP); + AppendTilesetAnimToBuffer(sTilesetAnims_General_SandWatersEdge[timer % NELEMS(sTilesetAnims_General_SandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 18 * TILE_SIZE_4BPP); } static void TilesetAnim_General(u16 timer) @@ -239,7 +239,7 @@ void InitTilesetAnim_General(void) static void QueueAnimTiles_CeladonCity_Fountain(u16 timer) { - AppendTilesetAnimToBuffer(sTilesetAnims_CeladonCity_Fountain[timer % NELEMS(sTilesetAnims_CeladonCity_Fountain)], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(232)), 8 * TILE_SIZE_4BPP); + AppendTilesetAnimToBuffer(sTilesetAnims_CeladonCity_Fountain[timer % NELEMS(sTilesetAnims_CeladonCity_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 8 * TILE_SIZE_4BPP); } static void TilesetAnim_CeladonCity(u16 timer) @@ -257,7 +257,7 @@ void InitTilesetAnim_CeladonCity(void) static void QueueAnimTiles_SilphCo_Fountain(u16 timer) { - AppendTilesetAnimToBuffer(sTilesetAnims_SilphCo_Fountain[timer % NELEMS(sTilesetAnims_SilphCo_Fountain)], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(464)), 8 * TILE_SIZE_4BPP); + AppendTilesetAnimToBuffer(sTilesetAnims_SilphCo_Fountain[timer % NELEMS(sTilesetAnims_SilphCo_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 8 * TILE_SIZE_4BPP); } static void TilesetAnim_SilphCo(u16 timer) @@ -275,7 +275,7 @@ void InitTilesetAnim_SilphCo(void) static void QueueAnimTiles_MtEmber_Steam(u16 timer) { - AppendTilesetAnimToBuffer(sTilesetAnims_MtEmber_Steam[timer % NELEMS(sTilesetAnims_MtEmber_Steam)], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(384)), 8 * TILE_SIZE_4BPP); + AppendTilesetAnimToBuffer(sTilesetAnims_MtEmber_Steam[timer % NELEMS(sTilesetAnims_MtEmber_Steam)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 8 * TILE_SIZE_4BPP); } static void TilesetAnim_MtEmber(u16 timer) @@ -295,7 +295,7 @@ static void QueueAnimTiles_VermilionGym_MotorizedDoor(u16 timer) { u16 i = timer % NELEMS(sTilesetAnims_VermilionGym_MotorizedDoor); - AppendTilesetAnimToBuffer(sTilesetAnims_VermilionGym_MotorizedDoor[i], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(368)), 7 * TILE_SIZE_4BPP); + AppendTilesetAnimToBuffer(sTilesetAnims_VermilionGym_MotorizedDoor[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(880)), 7 * TILE_SIZE_4BPP); } static void TilesetAnim_VermilionGym(u16 timer) @@ -315,7 +315,7 @@ static void QueueAnimTiles_CeladonGym_Flowers(u16 timer) { u16 i = timer % NELEMS(sTilesetAnims_CeladonGym_Flowers); - AppendTilesetAnimToBuffer(sTilesetAnims_CeladonGym_Flowers[i], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(227)), 4 * TILE_SIZE_4BPP); + AppendTilesetAnimToBuffer(sTilesetAnims_CeladonGym_Flowers[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(739)), 4 * TILE_SIZE_4BPP); } static void TilesetAnim_CeladonGym(u16 timer) From 6e26b4958985241acb4b67aa1b120f0f72ad4ac4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 3 Jun 2021 13:53:16 -0400 Subject: [PATCH 4/5] Correct palettes on tileset anims --- .../anim_celadoncity_fountain_frame0.png | Bin 191 -> 249 bytes .../anim_celadoncity_fountain_frame1.png | Bin 177 -> 235 bytes .../anim_celadoncity_fountain_frame2.png | Bin 209 -> 266 bytes .../anim_celadoncity_fountain_frame3.png | Bin 235 -> 293 bytes .../anim_celadoncity_fountain_frame4.png | Bin 219 -> 276 bytes .../anim_celadongym_flowers_frame0.png | Bin 171 -> 222 bytes .../anim_celadongym_flowers_frame1.png | Bin 171 -> 222 bytes .../anim_celadongym_flowers_frame2.png | Bin 157 -> 212 bytes .../anim_general_flower_frame0.png | Bin 166 -> 219 bytes .../anim_general_flower_frame1.png | Bin 165 -> 221 bytes .../anim_general_flower_frame2.png | Bin 162 -> 219 bytes .../anim_general_flower_frame3.png | Bin 162 -> 218 bytes .../anim_general_flower_frame4.png | Bin 163 -> 219 bytes .../anim_general_sandwatersedge_frame0.png | Bin 407 -> 461 bytes .../anim_general_sandwatersedge_frame1.png | Bin 419 -> 470 bytes .../anim_general_sandwatersedge_frame2.png | Bin 434 -> 485 bytes .../anim_general_sandwatersedge_frame3.png | Bin 460 -> 512 bytes .../anim_general_sandwatersedge_frame4.png | Bin 444 -> 495 bytes .../anim_general_sandwatersedge_frame5.png | Bin 448 -> 501 bytes .../anim_general_sandwatersedge_frame6.png | Bin 445 -> 499 bytes .../anim_general_sandwatersedge_frame7.png | Bin 408 -> 465 bytes ...eral_water_current_landwatersedge_frame0.png | Bin 577 -> 629 bytes ...eral_water_current_landwatersedge_frame1.png | Bin 586 -> 634 bytes ...eral_water_current_landwatersedge_frame2.png | Bin 767 -> 821 bytes ...eral_water_current_landwatersedge_frame3.png | Bin 783 -> 834 bytes ...eral_water_current_landwatersedge_frame4.png | Bin 831 -> 883 bytes ...eral_water_current_landwatersedge_frame5.png | Bin 856 -> 910 bytes ...eral_water_current_landwatersedge_frame6.png | Bin 811 -> 864 bytes ...eral_water_current_landwatersedge_frame7.png | Bin 748 -> 806 bytes .../tileset_anims/anim_mtember_steam_frame0.png | Bin 175 -> 218 bytes .../tileset_anims/anim_mtember_steam_frame1.png | Bin 171 -> 224 bytes .../tileset_anims/anim_mtember_steam_frame2.png | Bin 173 -> 219 bytes .../tileset_anims/anim_mtember_steam_frame3.png | Bin 171 -> 225 bytes .../anim_silphco_fountain_frame0.png | Bin 222 -> 284 bytes .../anim_silphco_fountain_frame1.png | Bin 208 -> 273 bytes .../anim_silphco_fountain_frame2.png | Bin 213 -> 276 bytes .../anim_silphco_fountain_frame3.png | Bin 204 -> 268 bytes .../anim_vermiliongym_motorizeddoor_frame0.png | Bin 138 -> 175 bytes .../anim_vermiliongym_motorizeddoor_frame1.png | Bin 146 -> 186 bytes 39 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame0.png b/graphics/tileset_anims/anim_celadoncity_fountain_frame0.png index 8afacc21017f1fbc8a83009b51c95a79c06d01ba..c5783f481655088a1559ce88588a201eab320586 100644 GIT binary patch delta 232 zcmV%t8Gi!+008Ny<^KQx05DKYR7G>mr2qf_-rnYWdxKI^YQ^sVtkwT} zq~2nSz4qpd#k6y*oLYONy_CJ~|ILf$gL4L)P{sfN0E9_IK~xx(mCLaS!!Qtq;RjhL zaGm2hw1Li^z^5X$^$Ks{?%IrCNL*;B$SB~>kiWT)2M7F@)M4tmN$0-G9i1QW749#Q zhdW%vOvEAm6vMCy`j3XF&kf~$U??b)#_&V!8hgV6Ht-6$A)QNV$QT>u6Dc1^8JVVP itY0(DI1)RlN-kfWj9~D2vzBlG00000lxu|8Gir(008?EN)Z460ES6KK~xx(jmxnK!!Qtq;kT0tC*Tp%Ugs@b zoLr~Sc>?>if#z`B9b}kL^T*y|GgR4Ip}$y@)_&B4z~J z=3Lg^u-&v|ef9|VhBY9}n#+OOH9E%#cJLLVBb`ffL@bW!L??<3DI&6{3fI@fBD^p< cW>x0#2i*pq61aiiY5)KL07*qoM6N<$f+GD*qyPW_ diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame1.png b/graphics/tileset_anims/anim_celadoncity_fountain_frame1.png index dbc8030952e6feeeed8e6c8ef6057d255d6dc3b9..7d1f6fb2e8bd978f913a613e72144c0205a90639 100644 GIT binary patch delta 218 zcmV<0044vi0qX&f8Gi!+008Ny<^KQx05DKYR7G>mr2qf_-rnYWdxKI^YQ^sVtkwT} zq~2nSz4qpd#k6y*oLYONy_CJ~|ILf$gL4L)P{sfN0Cq`4K~xx(t;n$rgFp~O(UIJc zrOkjgxDIYf9JB7g8_)&Wq%Hvo5nN6??D=v_mi&`>8sN7iic`5sN3L>5#|o|>-)21t z%B*?{Awy0%ZGvIXs_C(z?Dd%n%B0kHv)8Gir(008?EN)Z460C-76K~xx(t;n$r!axv2(J6=g0?U$1Af3!z zI9NJh9h0!v!MP3NY$X~(f;}HGBJfYmr2qf_-rnYWdxKI^YQ^sVtkwT} zq~2nSz4qpd#k6y*oLYONy_CJ~|ILf$gL4L)P{sfN0F_BZK~xx(t<13v0x=8)P)kgZ z=2!#C-2p>fkx*0Qr=p-BVFO&;7T39D1ez<-okVxL;IIJ_UvifIlVzFcx3I-(!@cUn zJLt2y< zmnzM<9jB2bw?9e#heyNRAO$GWAjMi}mT$%nxOHI0Kz#w@00000NkvXXu0mjfvMzUj delta 192 zcmV;x06+hV0?`4G8Gir(008?EN)Z460GLTcK~xx(t<13v!axiKP|uPMDcu!m7=hMZ zwn$+%AV)z#b^i)#?urZnq_e~tq`3)@z=s%sf-g&c`m#)~Z|FCu#qiXbxz{_*T){mt zZ<^-DOsp%QRVKXvIJQbxD@<#0DFP`vav9mia7sX242KL%4>`lWmr2qf_-rnYWdxKI^YQ^sVtkwT} zq~2nSz4qpd#k6y*oLYONy_CJ~|ILf$gL4L)P{sfN0I*3!K~xx(mCm6K!axiL;6LFB zPV7BM>c(DT;syqJodL-XfhC-Pr@+AC`KXy6_Gi%gyPPj;zNtR<0^37qi?==S!=6!vS!_5(6|1L7`XC2 z@QAKr?>TI6%xtDy;o@w@y^+ey`!Y*NJEvJHn$kI68-i|4u&v)X8TN`~rzS&+S`!{= b%J~CCR$X@mO%D4V00000NkvXXu0mjf6266C delta 218 zcmV<0044vW0_y>g8Gir(008?EN)Z460J2F$K~xx(jn1JC!axiL;Qw7F2uLPi$sPe) z$5Vhff<w46Z{9!D4x<0E#-lZ473E% zLgY>a67gPyAgyQirJ$X2sCic+FSrhT&XHGNjP2>Dn6T!OV^gZV&N587jxlhCqUIPm zoUrX}r@3O4Y$uK2nm)#+cW{TKxhbk9rFb?3y&7Owzp*jw70$lu49;tHn7JYAH#SS5 Ui?2>M5&!@I07*qoM6N<$g2r-S@Bjb+ diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame4.png b/graphics/tileset_anims/anim_celadoncity_fountain_frame4.png index a096093679eb22b39f21f4fc0926d7b208a37cc0..dd9a94d479ee52a226822ffa6d36022d1a58494e 100644 GIT binary patch delta 259 zcmV+e0sQ{k0h9ue8Gi!+008Ny<^KQx05DKYR7G>mr2qf_-rnYWdxKI^YQ^sVtkwT} zq~2nSz4qpd#k6y*oLYONy_CJ~|ILf$gL4L)P{sfN0G~-jK~xx(mC7Lw!axv(;g@iN zip6mUl5tHhQL`unVh4qUH5_0>dy2ZTJwg+xSc8Dna2IB&zs>mD%LUrfh`8puo*ato)q{|OB&9D|R&S)SrWC`bto#C0W zH@t!m{$%hOLC~)AbePcA8E%3+9CN*~pSCUvHyKRsErL4OhP zLrCz9=8>jzhNer18F(Ewkv-K|xvF-BY~gL^*bM7oUxq^3H4T|D-w1 zK}UXMMzI^x?BTs@@OB)lzW?R)YJh3Z6fVMJty85}Sb4q9e E0P$W~y#N3J delta 154 zcmcb|xSDZ-WIY2A{Lk>+1Eh*PT^vI=W+wmOXXOz%C2{0O&Y$}gMjeS_X*R+~e!LOO zGQBK!!oZt%a};aRjJ9Pn#hFWM&HTLeeA$ftow2D=Gi6mNEm~HX6=CFY{nW|Kg$Esu zNv$?b%T!ot+#W7@dk%Z&9Lv<=G}{whrs)kPXTJUa&!{c@A@Z8!fu|tr89ZJ6T-G@y GGywqh3_ace diff --git a/graphics/tileset_anims/anim_celadongym_flowers_frame1.png b/graphics/tileset_anims/anim_celadongym_flowers_frame1.png index 5d1c493e38297f8542b9e0fa3d4ec93a2a4af676..fd9eb53f7327b58045822c2131b75b866b75d07f 100644 GIT binary patch delta 205 zcmZ3@c#m;{WIZzj1H;?9kAi@dL4Z$)>wkv-K|xvF-BY~gL^*bM7oUxq^3H4T|D-w1 zK}U+1Eh*PT^vI=W+wmOXXOz%bz>f*Pu)Duq#8fpZF6`g8F})? z?UXq2V~*IYJ*VW3aPWHTu^aZBy>#ZVL(k;moW52|X36?AKQnG$=FIK0Qm09ArL3{s z^Qs`qDB#r@$<>F=o;UWGru*HT6UlE>c~(+^ck|!>^$ahBzeNf!D%vOja)zg?pUXO@ GgeCy26+C7D diff --git a/graphics/tileset_anims/anim_celadongym_flowers_frame2.png b/graphics/tileset_anims/anim_celadongym_flowers_frame2.png index b28a96814acf20aa221b11a63171091affd4ba52..a3edd7ccd77e7292001da1b4b01e47f32edcc751 100644 GIT binary patch delta 195 zcmbQsc!hC-WIZzj1H;?9kAi@dL4Z$)>wkv-K|xvF-BY~gL^*bM7oUxq^3H4T|D-w1 zK}UzM?87Q^p%qg2Q>p^PPoB`4ZO94pzU3+@BlT-iz002ovP6b4+LSTXgem)rh diff --git a/graphics/tileset_anims/anim_general_flower_frame0.png b/graphics/tileset_anims/anim_general_flower_frame0.png index 49c7ceaaf502d442a50023340d98b82ad862cad5..d445b4045df3d8de2bb7716272ae949c94446a0f 100644 GIT binary patch delta 202 zcmV;*05$)n0owtP8Gi!+008aX;!*$r05DKYR7C&)0KNZ7 z2R74iKCXa^Lnk>5SLncMESi`yd|vY41N@WqY-t;MJ;18DEknaqdJTva4jZ7#8cvJK zzDM-^n9Qj>(V2!LA-zkPBTj&M51)ggnvBSk8fP4_~8$?WgF{$mr(f=6aY=Ozq_2`LA9oja?!G_>T&3lBq z>>^ebJKqefB5rQ4y{h641U^MjET396t5;$<#N!622T3(KXAX0v00000NkvXXu0mjf D3ZOnK diff --git a/graphics/tileset_anims/anim_general_flower_frame1.png b/graphics/tileset_anims/anim_general_flower_frame1.png index c8b469f6b6fea26d9e238766af3ebca8b7abf02b..1aed594f656003ec005ba84d1c1a9bf9279484b7 100644 GIT binary patch delta 204 zcmV;-05kuk0o?(R8Gi!+008aX;!*$r05DKYR7C&)0KNZK~xBtMT80ao*tre?{;#*>UPfvAK{sMDng> z%gLNahDhVl6nQ38LEf&rt0IUBpnDaqw$-*+Th;~!RS;f&4m9$Z?gO&`0000+1Eg|1T^vI=W}2Q=^anKl%c|ATW@}@P&$4CJklk8gqMdcLDf0Teecq+ouoWMMFDjfy%<3HA`hd?lEZ1 zR-(3QW^jLpX0lhf0h}A;s{qJ3StjZO9EjskFizOP1LFiS?~XNQ_W%F@07*qoM6N<$ Ef~j#;^Z)<= delta 145 zcmV;C0B--=0ipqr8Gir(0094JO}qdA0BK1?K~xBtP0g_lz#t3+z!xn=R$v%ILqP*f zknCqgbQD>Nj)EAHNO5)2|H~Nf;fEF;kc|s1eaJg4kUJ;{VWVUzOhlWHC>>Aaq=s&^ zokMh`i(td3)ll)kz^OD8%P%&}<`VP@UB?al8cmbfj7L5I015yANkvXXu0mjfV5KA%BrQ-5#0><9_y+&rgGKE(+W29Ts|Ob6&^8j;I<;RQCp&`srn$#i z#oCP`zHfXX+^e_)fp-xU%P*^D^+=o!@%R8o{7a>bb=K|x015yANkvXXu0mjf$vr*I diff --git a/graphics/tileset_anims/anim_general_flower_frame4.png b/graphics/tileset_anims/anim_general_flower_frame4.png index d4d826f6dbdde1eb4aff059eb97a201925976df5..8e589150a000b42f4ce61f96dfb551b1cf48ddd0 100644 GIT binary patch delta 202 zcmV;*05$)k0owtP8Gi!+008aX;!*$r05DKYR7C&)0KNZr|77XbchD{E5AYfm4JRwsJ zn%Rqv>6^}Yzc3h)tjdUbLjjO;unebG{9$m9D2;}^FLI3~&07*qoM6N<$ Ef-&M$6aWAK delta 146 zcmV;D0B!%<0iyws8Gir(0094JO}qdA0BT7@K~xBtP0cY5fFKM7&>!N)B{)oBabQ7D zfcGN?rw(3_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0a!^yK~yM_eUY(F!!Qtre}hvK)E|dr32!mlRw@0 zexLQj%;Pv7CkDnaXoFc~7&MX@HwpAKY9R@vN1(Vj##le_^%${!47damQ(OXzF@Z-- zXyyWXDnR;4WFWGdfHmlr0Y~{N$JMgP1g!PYvv&EOe{dmn)>i1{`Kn^bq_Frzmb#72 z*L~c$O=&axhJOn>%7S1~SnF(BVOXRu&aNs9zVfvzT_3%nb9U{XS$TlLHGZRR<1c8M zn(`Y>8#pL+JSueu)doUiLQb062b`$4yA#}U{tGg-3(m#`WQ`NhWr1xAO`{kZ&@NG3 zZ}+rM@I-|J@1to_o&6A+KF@Z2>UD>M+~_uOs|j^VkEP8hj%eb zWG-*_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0bxl*K~yM_ZIQoD!cY{(zaWZk zTqcZ*R1*g`F(J;9bY&?sgSlNvDBf2%tq&lDMK>&qVM6*Wkbm$3eFo3Dw?vGdB}`pu~ zu@5gTByql`bbq0s@^wZDz2lryHfOk)6Xg`I7~)AzvrDwT(nXr(byS)Yk8YQ|qTiCIG8UI01Y(yxODnwA8r$q3s?mQ8?#&kv8wYwG_z_xKC66lD2L0S6SWx<}Y2kCP6 zlu)QEfi2(De&xL5dmf${8gh^3PVe9kaiaB5^0D|Xjj|4{*No9Ot{N65oezX*4{z;TvQ1^XpYpVPOCO002ovPDHLkV1o3H-?sn& delta 404 zcmV;F0c-x&1ET|w8Gir(001Ag$0h&(0cuG^K~yM_ZIQ7~0znXl|5vydFo9<|q#`yT zoi=dz0N%|jtQ-mLZ7is{hL!|tLn3w-CUV#qsW>_Xk*qVjN7U#ffA-7%H#>9rkq)&^ zlw!{W`f?>f<|xZJjB);YJVg%WgC&)Oyw%YFrLW^ z3<-aw1auOM33($v0MATexEkliFub*!p#>rb??mm>-~@Z3$S0~{83e5=Q5B)RxLhEN z{0as29Jya>5%i z7xf=_UReY$&wo7;@+`|m$maK%2ot3yBJMhR68(VE>QN*x75#$3`rBo}u5keAa{CnE z<#T}&?=!pL^N9Dky<%9&KAJnT?;kW~t94)CLvrskxZD|Bwgx+w`v9Ng1GwA=*ty&X y*tpzB*tpzBFfMm~$K}qjmE8MoXl#cT^#$^lN#>KHM-77j0000_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0dPq~K~yM_ZIQ7`13?gmM^J;E zdk8UB-V%t75V$~EAqQ#GTwcJiX#+9tE6km(pqn(>ov|@iA%FK4*YCUd?{3f(F5Jzx z|IF;p@{>{zeZ9yODW&FG2bd1^V(g(0iLy+odq{w6tkS+F?O-|pEL?Iv+{2_t+UEd6 zCyl2GK)c2P^|Y7fl%&3DLW2Yv%1NaOk^r~XZ$6wY%fbV5fE(uJhxwu-=DcG5rb}a1 zTjmWFUU-VB$bYLHn@>Ta+O4_ZcWNQ5OTbmhTyef7QRc6PSJyZPmFvwpQ7ob)j_99d z_v;U8DXo?A7EMA*AtDm^VS`I0LL>!A2#_SxyJED4u39{Yd455P7Z12RKrC8-T4FE*z&ys7M^9_xmYYWb%;6JH=X&O&^W9PK z9T0pcItjkds1bYz1mExWFzHew`0l{_-X#jYlY>QoV<(L$(CA=>AAY0H7o?eXSO5S3 M07*qoM6N<$f*QHu#sB~S delta 419 zcmV;U0bKs&1F{2<8Gir(001Ag$0h&(0eMM8K~yM_P0_(l!Y~*I@b6i6-&;U9i5GD< zy+AebDtxa{=Mt_o_yTa@N&<;j5|)s7k%Y9KL=v-lGop#}-*yq2Z2j%ucJ20&Quhm) zjuk1TGARQFQ<;uD7Kms(R_Xx}FdnJdLXvbC%z@MmX44A8C4Wgj225Qv8sva<3+J?y zKFTPc`B_7n=g2Uf)GWs!P@=Ui%M$qPBwY{YfM@2;xj3a?=3b5Ygx-W`H<+8$^}(&7 zZm(8nac0TZ>Mic_1#Qu_65usqu5qtHHtAgnZol9?nAvK6P-$$Do1*l)yLLcSwF6?U zqe$x~GS+HsZGS-)H#}fdjjqs^Gy+7L@S!tzQ54%v6q|R7jDy_(#SRba3dQaib{*hW z88;bA!>ZWcg!BAE+iMSO9$@Sih&2u-0Gvk%aTi5q>&~M9ar~wGO!gi2uI_yx)Ex+Q zFX=nfy-#1E?m(#fV};?0zCzs{eBD=6hPsyyX~2(*CLC^4Xma$Q{{YwMZn}G%h8X|= N002ovPDHLkV1n3M!_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0gFjQK~yM_ZIZoC+&~nC4~hax z#|#uW62&-0EOoE_5qP%a8`TWq(seX%PDqet>zGoa@?FY(@Uy zB!pkDA~#5mdw+-9V*4iHw}IKdZRAd#k@4EB71knKSqR*E@et(U5PLQ^=JU-V;EXMu z#eYuR9Sp|AIG9ry78x4QT1NxgJSQV$OY4edi7XT$EJKE=_fvfk%~2n1-m}k_<7gbg z<*UKi6(J*JU!g`{m~2;ra|*5>OwmJ2qsfj5wjcLlPHF;fv5Jw4SvKT`2F?~0!vkI7u n3HC|4>nIiZN{2CP_HKuNHgCgS-;R_X00000NkvXXu0mjfKKSv5 delta 445 zcmV;u0Yd(O1k3}F8Gir(001Ag$0h&(0h38YK~yM_O_9B7+&~nC&$G+}=qc8u39ho) zE@|TNg4izJTgCNcWk@UGBDK|QE7(9lps2X*lo?;sUD~iS?sDCaR2Q972{Q>BLOR;Nc zTc+=!Jvg(4j;!nQ3)*IK6&QKuZ^x1F`($x8fye}ZZbVLA+n4wzvYv??@BYfx@h9kHF!S}Fs z_mQ4E-KR2HXrF)SgWGHs9#!`(A?dC#=|18y>AuBN(l(utbWcE$KM^L~4^Ulv#h7$w npQJnCK}G(oLz%UG_MiU&AS-%wRCwfC00000NkvXXu0mjf^{CPB diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame4.png b/graphics/tileset_anims/anim_general_sandwatersedge_frame4.png index 1d3ec938e0516190b2a0b0cfcd3bb4389a941484..5b74a16fa4282a3765e738a98ec04290a914eb23 100644 GIT binary patch delta 480 zcmV<60U!Rn1MdTn8Gi!+000dDXvhEn05DKYR7L*)0Ot1pz25(er2lH9=1P>_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0eVS9K~yM_ZIQoD0znYQKMFK< z-r1m5w^v!17?;FcEy=YuM@>QY9zbwwtp+S1ITjo35F71`Jb#7P@4Gm&2hqYwHuK9j zJAaZ7c3c#Nx$Ppi4E<6=3-yhK?McxXnBfk}rUqm3ATd}gjo?-*5~Nim0W;$Nkk)c! z#{tYR7vNgiwHOPPns>=^bDcwC{T$N4ay1P=6rj~1TE4n>L`0Jf(FZ!tJ$(}0qY)kx zJe+O5$h}2~Hh*7hn$io7IjvU=rz@fjO$fjqZPZ|D1 zyC`lX?~AtshQ@b>;THB9-v`)hd>05N-=N+2E)b*u;yaIQd`AHGT~>+j7iehk=Y}7< W(95zAzJ3A#0000lFgN4!! z7H}ick@hA!o5BOc>d?7ax>hQ4gj82Z3`}t*pbH5bq6~yPr-)jL{OQh@b8;}FG)?W@ z5_7|tCJs(CwFYJ(No!%pe@L1fteuAt!x$+9ml_E{N+l$)w|{&dQkvYFQGgxK1)NKk z1|w18xR*4y_jA;|+Glmm_`K-!1Be2C)_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0f0$FK~yM_ZIQ7~0znXle-nk+ zc~lx3SsJM{9toi{k%T8WY6`N~l5n`MFkmSO9yHn^HezMqS%2={z$3W_aGl*f6HNS* zyZN#+v->AMf}ks-h8iJY3Vo$8VhZn?3d$Tseg{gKUerKSjd(na5HSQ&O7u<7K&Wg_ zLMnFz*;jT7{6NRt#o!3s4*5+Ba@aAzyHbDZ;3u| z8pn%IqBSP=;D4ct$#}b=_|1d2-K=OrFF50}S~8q3iMBNUgtr_&#k9EKdw6oSJ^`v; z#jjTIkCH6=O0z6MruFwu>kPUOav`)9;tImQ5u)Y`#7>XD5TmVB+k8lMZJO%(6lq?c z?hNem)@+y8X9cwWK)nDSGz&1RZk>M#%eE4B2hD>CyI+GA3~Z78#IscA){jcH@EKAH+ZVyE6vwJOBUy07*qoM6N<$f`l37UH||9 delta 433 zcmV;i0Z#t)1Hc228Gir(001Ag$0h&(0f$LMK~yM_Rgu9?!axv)e;~mv?#%A|?Thw-^kuzn5Qs^>eHxmUVTWK+ZQc_FrFi~A@&r+lexz-w2QhyW3l&xuK<+h-&lj=<%NXIjv`kpS0v6P2UnXq=QK!^dgVwm{_Ik?8a&KEM}Ir%JSsw>WO@5!KPQ z8y9o5JJlM+hf6H0wFb567_Xcf5yMMFRHe=ymQm*{rsgx>!<~)#JIeWTQOp;moi6bU zq3`boz8}H|c7Hrb`iY7$fH4m+#l104g+c7%{0CxOD|Iak0iId`W-SDjS<4gfD&xef z%#tmP|G{hv+$aYiN8NFLgdDaMvO3l=PC_foFnE%SI0;yu$WQ^lG9;I*!0OQ!{(R|X zm`w#X;`@}r`Oe^cFR^mI_wng`A228fE9d(FYv((I^D2FS(z(s|INur8;(K3)u66JB b&wu^~l1xGt{mrr8Gi!+000dDXvhEn05DKYR7L*)0Ot1pz25(er2lH9=1P>_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0e(qDK~yM_eUiUU0znYQzu^B4 zI*pAi6|pfw!UI4;YjandNS2laabID;mIPND?GPGch2FE=y?=ps2@l{pvx||+NhbTt z%+1c1{SI39nr0M5hy@Ho6!#llE+LBIc9%;6L+*_PdX0`TFj1`AjV8k=*1FRWh_u$X zE${$?9-`}ex{p>U^>HKDGD3G+yeW#I`)%3DpohK*iN&)&jvnU|4@3bDi5_3=8%jju zgyR)3iI!hIE!aq>xaSwSWFT+oDGaKgu8&Tu*>N@%=d7(XQRbcX7OUD`!b zM(OxL(fK>CD5)|kW&B0D38Z=cmF0Pg+_~?^99n&VBJ+DERI{d&D+#SIudpHs?QJlzzH4Yn-~mX$*cdBM8zUWbihsyDvx|Q!CpXz&W_NbJ+YiPJ zX1bf_$OJS)o~82nDBZd%W)qAL9E^hJI>2w7>8C Y1!&tg*k5_k%>V!Z07*qoM6N<$f_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0bEH$K~yM_eUUv*!$1&)2Z=!F zk`9q$Y$TTyL`s{+u2V$oHWCioQm&l~;G}`hI1O|rdlu&iPJiJ8Ec12^xMHNyewsf& z>ydn%t1yft$#|+ZVaULx9|+K+NG7gFVH69c0Ac(PaET#G1YZEeJf&#E$KoUagi^{x zk#ewNKu^YVQoaOmQ!7fK0x}Tgt9x#CMdm_RK;{bDPs&nr z)cIjVcjj2?On<-81wUoMur0JUI<06@q%TJAD;j_02UD664JXFvgL%f~F^zBOFX}FO z&@?rY8fzOQ*)FIR!dfBjNpwLorDjN~Pj-rAXgfH!0rFpPTkW*J&fsMH0)_#N1)QKq zFf^7}i>gm&%X)$*UTC35GKk(E(xuug@Ls`pkoO(nd^;x^c;6Q^@V*0_?+)Pm8UWt` s&i6Hu_nq%}-x;n^TH<3owd`s525F!VZ7X9)B>(^b07*qoM6N<$g72!%Jpcdz delta 393 zcmV;40e1e;1DFGl8Gir(001Ag$0h&(0bfZ(K~yM_ebK#c!Y~jA@Oyv^LtH3?lreQ#Hj07V6(-k|7h)i@;hx^a zAd$JeqaR+9lrc%A6takEn-&j3j$+zfWkZpOJ#||lc%zrDV4_Yg=MpD$L4U!QY(FJhwcl#G1imo$CBx4haC5hG@N-|%!OtCVb9cbpX8`67xVg{B`nmHv ne(sDn?M9GH!+d0000_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0su)wK~y-6t&}})(@+$KUxuKt z)f=Ll|AHeivQ%Pav9osZ?UFU|(t+_N{R6mNU<;0fU<5(7buX8L*7s@40puBA*MdGcKcq?hLC$UJfC+!?m+?tcvN!l70bp}rH z(LG+AFBeXxiX>?d5G*Ru8tH(aa7!azD!M zjCQ^d&y_m%&({2(>}1f&F$T$=#3IRG0{^#J;#LN1u78-dce_oTOvf_@S(0W9rb>+& zB$G|bKoKbh6QT_Rx;`Zalx4*9c1|bTDOoJrG|evt?Z-5PE20|)p-(3_VR*&ho~UBF z5=C7X48kA?83aBE>|Mv$JFiV|A}32NsV+VDls{O+6lA6w;0XW#002ovPDHLkV1mYR BE9?LO delta 563 zcmV-30?hsO1i=K58Gir(008Y)QIh}w0tiV&K~y-6t&}lu(?A%8U%}d;uEf>>`xhWx zhi2}TY#^kVY_PQE4>Y-vp^K9>OV3Nz*b6IC7e=J`FL*0rbGJs#z;WOC{MjNELL#s9 z$WQL>yYC!J2klbi(B4|fkbCQ-XeG;cq+rQ+q?v;*8go)O$$uK7rp{n&;*Z8ydAJ-; zoG8`EMybp9$y?ZgsZ?r+O_E#;NhWUK>J27Sd9IStJ$}gZSWVOi{IZXDY~^aKlvL9p z?#9zkQe6yDzfMLnmiO4)NvTHiGwocP`loTnpdj*jN`fG=93k+*L0JN2`OVSxSR9fQR#b`p9Cf|4YlvwV%B@X$WjGdplV=h3#Z>|W5A zN3EA6kMwPpR+=x_lWikQZ1Wu{Sn@x_G+*106pd`js0G;<)BB%q=BpWjG|y53bFEhd z^2Hz{poP!`7D5aNh|_C9K%}W4_O?$a?G!KOa^8?zaDP)i#=iEsnQKAVsf8fyVsT2q z52T&&6ffrTeeEOkYDPc|vXsEJ{YfD8L!IyxFYe0sv`-fyTAK7kNSu3Gd9kxI3S@cmMp4{05^?<>~T^#l`>t002ovPDHLkV1mil B6!QQ8 diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png index a765897d9c3b5efd05ea9baf885203f8ba49488d..7e41494c53680323ad26350b919ed21a00a67570 100644 GIT binary patch delta 620 zcmV-y0+ap91o{M!8Gi!+0095v{(S%d05DKYR7L*)0Ot1pz25(er2lH9=1P>_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0tHD#K~y-6t&}lu(?A%8UquRn zE!QcCguy1{_h`vbbzS-beUbWOZ;VY`GMK;15|1y@2SQ-A1nPKSOHzraCVkuZM% zF!$M)JEOpaU+K|3@!fa#Ikt=>vQbJwsm83>M6nYUZ6w)=p%yyu@1)d1(x; z3k6R8wjLgw&u6u0-N=2d&);Vs(bIZrv|eDCWfx1WmzdQTUhiTyHCH;j6cFYr*E9VN z5ABf8tvs4*ZGZH1X=Qq5^u=TBe#$Ph+zikgo=LsGut)Ud0AhfU!sTyLmIZ@Sh?0Sj zQZSHv&m@C`G(BK!)!h@OCF`B149g4V4{=l5RkhS@Y=otIk7aH9dH%+ZcebCG z6DvF1kFu4rb%*Fj(IJob_(8I{N9rVLW^4}sEk{B68-H=H0$S2{GqoMHn;0uKVi2FK z5(bJ$F*qSwF`%1MVnAt1435X634=6FQl_(gy!a`<*q8ea{Sp39-$qyaj1?U-c8XHQ zF1{Hva2Mhre#$TQ>IOSLL0)RB|~lVNl0K1j+=E8Gir(008Y)QIh}w0uf0>K~y-6t&~4+(?A%9f4~>ONURm{CqTLm z&D<-QB7{_v4VKpJ2OznPrHhlbOV3N!*h@Y@cfD{7_4ysv#e2N|aN zr#$u(-@n&B>5%3Wtu?f+jD(VBPIO*NT8qwFk|T4S8p*w6Eq}?qR0datMnQ?*7X``f z;b>fnQkDEx>hNv+8f&E{QmG-9aeOdPYJhS1;KMb>6S=42eG4o1A~ja;@QZHIh~(!; zDXAs{lF5-&2S0HAD&CJHxx#vRWYp!5mROrrVOK?21_zQwH-B`b!{nj~ek!zOx_R)jaJ8`Z08^(ufp7 zGLSA06(gl#U|bs6HfEQ>Qz0HPs7{SAKokTKgUAKXqv#ETzy-bPka^Y|JCDQg1%sEs z6Q+67T{R)L8C*&^WSTOp%Z4l!<)eji=}i30ey#Rr**Je5B7Xo?Jq0sIud==X0000< KMNUMnLSTaasSOzb diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png index 5673e4cdff9ad20d9a162a792735be92e83023a1..5765ac4773d5c2a3fc354460c28ab7d2ba861e7a 100644 GIT binary patch delta 809 zcmV+^1J?Zi1+@l{8Gi!+0095v{(S%d05DKYR7L*)0Ot1pz25(er2lH9=1P>_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0>DW`K~y-6t(38D)Ibo1hk{6S z>%ka?(x5&|;<`bh+Q zFG~mvRssggEQW+BM*))|lmTMkYCibOqqD`_gS7!(SbO%V{t6GQoh_~X22bny{LvKoz^dDkCG(bZdjuDSp(5=;Bw~n4b7crDzBBl~1MG#qp9IJ}_;wSR5q#eneBWOKguVkn=sUq4_x%(Co$Q9loim2S zuqsI4aOzw;bp+^Gke6x20!%Z+gkPK7q!coRB(JihSkX)CropFhC_XJ2i4RT(AM`%t zfhqdekAHm-D)R6?=>TYC3#??*F@`H87~A_TidMp#R$?TD1S<`SPm+&5=wq-4mZJ|r z5e|X!Y>y=`4T%5~dbWgC(Lh@okb#2o4A9E0qLs;}#jxBsfnxM&u^N2ne0VwiU^)7r z876ZciIG;$upmdb%8(zKj@hJi2&*y-ZGngVt$%EooZ>VrPb&dBT=DVu*oTHH?~}>- z1RorIkeVVfHd3&0Zo>j6wFAqgW5Ib{e`mo`>VIK$9{2jO+5BcfNV9Qp?c5CuwA2=E zw7zD+opZM==%t|P`-TOL6#QzMFRbmH5pMgw>-zp~`?31dbw63)KUF0DSos30lx5N9 nH6qmgL2%yLYutT&(*1K~y-6t(38D)Ibo1NALuWL{HqGgtRGq zbsSO=goL>cn#3T{a<>m~&Dafv8?T$R_BA{}UV(~+NYR>#5DDGVAteQ7W_P_li4GX) zKYusg{b#&m8QP8F*g(74IM|ey8c+mG1eEU>YF;ryW1%4G2!B)nw2KJ%UeggMEIcSI zn+wjlVrkTR94V=#-=>s+3GAscCghsCWw7Z zFw;7Ywf+RXF@IVcvjsyx^oNRSx@@%pO$kbAxInyMK|C{8@vQ$2anE3`2(~x$=hDOW zW*5w*1K!p1V%q9<&CFZZPXKM+SfJt#dUH)M)6`f_K>g%-Uc_;K&HX5XeD_K3lsad) z<7uB0xVbafxesvb=6>#=v0%qdpaR&rGuXL*fWgguV1MAb6WsFL-*eGhUvzAv7D6c! z!@MGaz_k#`S`eUML0z^53$SevJAQ3y)l!o!bal~m)tp{hv35R{K<|@~k@vy%=!4dW zJg`Ok`mql}K_1qp9RZaufrT#`+7P90jO}fSD)G&$#JAB^zOhoF_vz~3gSHL!z%uv{ zRPGR{pMU9C>Qa#iu%l<|Xcr}tQh`rY)XxZszf~oEu}aWwSHeRTd=e~1A37i2PCr-% zA5`OF?#H*$7DBP0Mlo-YADNC>wR8yc(xoQgw7u1gi(6c~?QP+K4%hqGd+bB0!umA+ ze4GykAEcr9Hl`3_l#3lmQ^A7MJb%oB)W^R;M1& diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png index 89276ad9f5f1552b121c26198de2f5b907c925a4..dbc111a7f824b52cea4cafd863cede53469dc2ef 100644 GIT binary patch delta 822 zcmV-61Ihf42EqoA8Gi!+0095v{(S%d05DKYR7L*)0Ot1pz25(er2lH9=1P>_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0?kQ8K~y-6t(3iP)Ibo&2O%QS zWt|i;5`|5Hu0(l-NVGKewQ0QDxS+AOaTBUd=%SM@4h?jNk$;d74T`Dlf^F^roCiRP zUm?uwhaD*q4U9DFpZDWGfA2^J!7;KV1qTTvB@sa}L1NY*StdjrxZp`@q2!4HUh>R> zP<=fLm~!vSy%A{+q6I7Ws#JP)G9`5}b$qOQ;D5RRlgqJ)9%t%e|8 zq0Wo_fkg;Wyxy{4jSwP)FM$Sn!Og*X8$|@sYReWYpnszS3-=L%mGOgnETD_^Frcvj z1<@gcC|JD4Wd>*gA&Q}{k4l``BR_oD28VY)afkC`_vHKyg6%tj={vv^+xKJGv3(~n zeMhi;Cop{{Fnvc!+jju4eRn0q+q*@5^nIl@CiGHjjR~SymXsjNOv*HqP!xQL-joB+PZt5a*;*x+GhX#?9Idg_~VBY0qwGk@5-=<%t5jK*A{!Z#twPgqhi0+mQ}Y zz(}+A^ZxnfyB%pkDvYwOz(EalMnsTLP@6TVH#Lz0B~@Kn$bVFAKxL}5Ae5>M;F<*` zvf6?Yd1XOK;h?MqWTTA%BYras2;UEvrv^AT@bjAU!&k{O_{8~H#QAf$PLj7zIX?$G zani!OZFInsml||*5c5<18an)mmjp}BBYwuAU7j5!{OAsT^^Mlw&hKDob$`|NgQ-q2 zgYN~BUb$5f%uZPd>@VVD2NU< zwEgxYE^9yw2yFvNa+%@GE%{OYqQ83hPw$nwAh@R&1^hAgAk*ROs!5;2&+Sfa?+s^=I>Y?^fMlpn~W(;2ui`ilJ;bq6sJ-I zI|VEsLAs?-y3J}lK0!F?s8I($Q*%6Y_hXi%NPEZ4_->5HcLV1bC5|>`h!~3~A#yQ8 z;^GfWyD$mvhUa32eb4iK&)b`yl)qS=95ycCann4ZggwUgDQD%_^I}SfUBII_enC0! znRK)Z(D60; AF8}}l diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.png index 6ea08c88a980fe00d610bb0649acce4792159c06..a8ee69c1e87afc12e695b18e21378b071d5e11e5 100644 GIT binary patch delta 871 zcmV-t1DO232J;4x8Gi!+0095v{(S%d05DKYR7L*)0Ot1pz25(er2lH9=1P>_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0{%%vK~y-6t(38E(?Ar)Uxy;G z)nO?x#hDno)JQ0Mq^u0YUK!%clA%NFTfCI%TE-P~9<#hdv24yUUK$ z`~{%!-rdE?(1D>(`s$zF-M#nqUThGe(@lCpfDmFJWoSUeGIh|C7DO*fpjSiBtTC9J zq&>aRKuSc=XNV1S>2J6N0y=IJ^eGjG+`ZFH4RGWi&ExUK^wfY-26pz9y7;WWfv40- zq11QS*ZRW`rGJjWCf+yU-HYN<=`S95#bvHe)hBpLk9fN>CL9RzI{x9OqBZP1!> zZLOgrWrqcemOiUm= zPpXQHk%>ulLw+>F6Y5SN9ZXUK9VGGQrx3*dQdfUVx>2zfhr69vtN*PN?goqNEMi36?aX6GQ2t*;U zOks#PAAd4nnIS0yloCmj>O?6?+B#u8vUP-b16@;RPQOD_2kCd1aUGn)tZV8ZV26lm zQ9&XDWmZZ_OQxyJ=FSGa7uHyrxE6!D>6VS!SZ1xxAT#E1wzkn<8;kk9V5<>~y6Zah zUT`gUKLV-6ko*jhnqryAtRx#qNorxCly*s!?0?6kGCD4hBsbueW^Ob4F$o;4L6RS{ zRFWT?Vm}#|0HilI6J!kMZeAIRDC2oaP9e?90^N^ULb@N5AkpzCC2c`wmquGY%}9F_UA&x=Aw!m&Gjw&rz#1uggoL|vV2U#VU5L9OwL{H&cV{OO z3<&Y0FaGJ>`ModqY=hSGS#PQ}Xst&|O$_K*MGmIQf}SQln15CR`C8ya45yg9P;3>B~RsR_)eEro8W6(%0Qk;ShdfNg*?82`*oJ*-_CEK zSmo<Tz2cIxTk6Tzax+5o3{8F(Y#0DLQ#fIY550qYX7h3I%5 z86y)NZ;$*4h9A_OKso3{2FQ!{mIPb>^me2M47WV@0e^v=y9F9|0e2P#aA)VvVCFu6 zTRV3KGtvu&*g#>&U2K8bbYYt6_~Z6Dk9zZ&>Ln4VNvxEL74)=DdMZj_GHk??p^8Bx zYK?vbL&V0A0sRn3A)r!7QdB32NXpik#C=;w>klw9bsF>>nmS0&VaRo`0nM4IgMf1) zszn8f41f5cuM{nrrYdYW8}wdSV}8%I7*$QTY*fZVYqbfXF^|pC#<(;V^LxQo6X?&% zI`m#}Eq6W|sl|}|43V0m-&3JaHjt9k!h)~tlJ?n;NriN~Mv~fqTWY$^?8hXqUxFe( zX2~Z%HpPBIE&)hyY^cc?Hr%{I)Je$mQk+7XmwyF1AG3sXJ|;n;+mnd21)*K)yUjc= zyL(&$olj_%5}H?8ht7vfz$Oq&+1P?0Ko$fp{tAQ(2!se&f7nyCsG{Wp9<^F8SWt7Z zf!$io^J=vn@La$H&wI>*CjbvwQ2rS>K-_0R=3)c;S$4pJ9mHMMrbVk(Yq99_m1iu- xT`cfdG-uJr)5d>;s&dt<>Rx&N{Y(2#@CyWGGNVKlBKH6Q002ovPDHLkV1nCQf^q-= diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png index 473f41e6dec717b757061407338e71173f970e7d..318c7b79650da6e7876b2d6264f50450a23cec25 100644 GIT binary patch delta 898 zcmV-|1AYA1295`i8Gi!+0095v{(S%d05DKYR7L*)0Ot1pz25(er2lH9=1P>_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0~tv~K~y-6tyD2@(?Aq{3>2}E zPDL!#U5FTvNS1C4k#4P2#aSygzAV{l`<5(hmoQQ(xLsfiMt`bkr>gFj$QgPPzrbNf zsv~8F9`D^J1Szu>|c}okc$9 zfXyLmTEN4oX+euMo6sa80|P!2ni&H{`q4ZdAB_eE zNNK?fDUUuUUw`3&l>JP~GuTLy<8vubVPFdHHet}uE@bkh0+s9{l>_++p5h}NA$T^D zGL!vtsEqm_5_$X_d9X7*eFCsqS+8xb!#|=Z%j;QL7Eo$^GuOHV?E)5_r?uz30_^oW`EY6ylgDlmGu0e508@b~EXhr6g_M`GZDCbwJ=lr6Q z{l9_dfaMUCano$}L)XoI43Ak9@sMBG%v&M)6;SB_{jz}N_UM3F9x=iFI2mH~RW5{oK=VAq}Jnxbc=1SdALP?)3CZuJVQbOtiex&IMC6q2; zW?IW@C|tm=qWDe;-?aWox%#D-N?lRH%Pc#iT*;`oxC1sM#@h-=7xxC1%*$DSujQWN YH?;WRl7~M=^8f$<07*qoM6N<$g5Dvn{Qv*} delta 844 zcmV-S1GD^&2iOLX8Gir(008Y)QIh}w10P95K~y-6t(3oS(@+q{uP{f7E3p&*1xT+$ ztYoXJPAx*hWP_zOk;+K&HkK^UcDF2fPNl4IREhOT8Q8icNDL?}by*Od8a6~22zT$C zq^KKk%Eh0&AK&-&onz2ir^>C5&$%p2{O zp*;GGI=C`8{C@_^tNG3J>Sk$Ar`Uk&INKG+alrxDDg#|sQOa|GJpTas^nIRRPICx3 zUacU+VyZDERN(TY0<#mSlx8Pof^zAiSuV|*1zh|AvjT7-Z2;QJ+wsfAuv0F&LmwAS z*V@Vv%5)go5tm>VNwHf%}fYeP6c#ds?0RX|tLGSW%B6i`F!T1NwFc-?x(1A!W%Zmf&} zjOeir0ZnBIPT}HM*HjEFjN2JZ##42}I_PI@Lw`Xe^e_@sAK|4+6#W`@ihj`$zc+9m za5zC{+Ag;Bq3yOlR>u~Kbf{mrSPv8IS4u;t*e?d-@zkkd9aY2n6gCvx4S^p@{N~tz zFN9ACei8o)x$ozc_&VU&z)qg;QbJjXElP0cZ;J_m;{=ot6af!{;0Yx-ML@+ab+*AR z0!8k*?n6p=1aO~nbEmsP>`=l--#?(-*q9e_3$7)`n>olL{u`{7*Js@=%iTBaU%_uj W92vV5VjeO80000_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0_#acK~y-6t(38D+dvG4i2x1S zE!t9aX_P7G)@M-cB}0cuS~FPm;?dSEet@&P8c38Z?UpJ)QGaAgqKt+;gg~D_?p`1= zkh!f&-koJnT^a&E^x=5-lRm-+h!G;T5D-I#Kp^3zP77KFFo2+yNRCt8ei#|Rq`!jj z&;o|Xp@TRK4J6?p48fc=AV*T!BTF5DWCdtyB1q()%;(kl<=BAM7G7$7{w4bcTUw6_ zt*>D>%PwxTzJGzSS@^gI<56*^vnvn0;x5-?{TW{KC%hvE}c8w*%`aT|ik?kBh1*p{naY%etdlgr zWqi6UBSReLK$JQqvbevDrX(bkV3?_v^Y&S=pHni<=?x*bxY0ki9 zq^Od@rj1nE5T95Y6CWk58lRMlHf=PGnO3LPXV#lKADr^FAaw^w?E$A$#P<{NW?q>0 zTYNu}EJ{BHdeRR{S~e?LGRISvfv$iocO_+f_sRY{S^f}#=lh-rJQtunPmB0@wefsloi}PV e)tjIEOz{`ZvI4(+@$8iV0000Qx delta 799 zcmV+)1K|AN2CD{;8Gir(008Y)QIh}w0`f^jK~y-6t(37&8$l3;CrORuLrNdt6GYk+ zwp?;Rg`!AY=#mBwB)75m0ciH@(v9a_(B2(I3L2YxhIA1XN17;frb}cbbeWmmJG)9l zM*ihbJG=jkcjN`c3=tOyh&e&QkkHa>0Sf^vpjafFqttYqXMX~ijBCiREnt3`J4o|f zAjwC04suq2kHox(mu3t}4Jb7cDvI!PRT2C?IT{FPZQ+mBCm*Bt@TB!H(E0%Gqv&{F z>wOr=!k0T341--A9WG%R?1p-vKfy2h3XceW9%&uu;Xc9eG|{4X58y=$_^XbRJ}mfFmbWa3TtHz=!2-W^+h-A! z{Wg?+Xv5YS>)%lJ`M~CJ0`8|>LyI>0)EzZK(3XB~&it126B)m?6;VHDvERCpeo&zK zfmQX0c)_sZabFPFxf9sASFo~kzkrpUy8zFfLFR6O=6^20bN@;{GI#Q^b0>J@adU}k z<%-sApi+qH3SpvDccO|esLr`ko$(c18KV^6VR4gM7`$10gX2VNzJSGWD8F+chDe<9O1ZC>u4RESweX>c<`CyOQNMnU*OpPT* zbrVDL!t|V$XkH7qMDr3*lroCbyxDM8jvJEmQGeEF$|>>TdGXQi$ZUY5F0D^D89N`U ziR(WjC{@eG1_Xg(!EqGru^@2qTxgt|T5kbfv7qh-c9eR@qPN1v8s3%V4hy!GYO}y| z0ioxGEC^k|>oEMlTJLFq-zR>j*00t}-+#k`Wmzs+uyg@>xzsGsF8&`_=Z#uT_2wsU dycj>vfxj+d_m0fef7<{6002ovPDHLkV1jaogI53m diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.png b/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.png index fd450cf5d5a1ac1ed90f9bf25c380ecf52443084..e01c91449033f32f05a5ece78e047b674a9aa7aa 100644 GIT binary patch delta 794 zcmV+#1Lgee1*Qg&8Gi!+0095v{(S%d05DKYR7L*)0Ot1pz25(er2lH9=1P>_N_*Z? zoaW8m?ySAddwYXgT5~aT#qQ>d=GBYU#cDgyyO00?0SSp*R{@H4bAO|*vWMO)*bh)3%HRi3 z?~W8@AVrq;fU`c_k^lV?Wq~#n$`~*i!MFom5Tw2bMoYI;u{xcm2)c?EEcybhPf23 zzr%c1-MhuzF@L2tNPlZXEnb}ILI)d4^@3KcsvJ-S^SH@JVuN&QF~&L>b~-#X+K4)ARkPLj5ah8~ zzMXMykj7GrZj=%>RM_MNf-k5J#1FSjO@0c$n6_su!Js`*dDQ8UaJPMO0Nkp%6^Duq zlBXwMASbM~#r2r2(qW*sQ$Q)vd3j(z+@gmDRDYEse?UgEoqp=5lj)#CJ+HIj?LAPr z=9UQOqC++;ZIA!K2-vpB2^gY>3bEpZDnt*95PxYsg(&!RdK03Do&Rn;^k0%^tVV~Y zA>h~P=}%60K-_Wm%4O4(oKS{<-(~rgvtJW+h9T%P=O{i5!G-u&h=Toy4&w9(|0(_e Y_Y+eY&==gQV*mgE07*qoM6N<$g2PUJPXGV_ delta 735 zcmV<50wDdS2J8ip8Gir(008Y)QIh}w0<%d(K~y-6rIayl+dvRS=Kv~9137?ng-s!` z4IOm}0+>;kG`4a9OWP%dnk5?-YP4)zs9Cbf0oh6R9J+wmTU>wv`}P#%J;|?QZi%&Y(duL4BV=+7Jpm|QX*@ss%pVi0$79^ z@j^5!61mJ)RC%z}Akwc*19&){Ed;do@Tm3a=lMrMVVP(>rN{aFWXiCR!r2E}ER!QW zKfb5m$x*5o`V0NVC7l7zW?CnDIi=g#@>`-$rnGxMKTgu*o*r+LL?0(VSb5j%?i#Vd zL8B0R5Je+SihqbAPU>P%*F<&w3+aO{jk)Bc(U7h=0fPVsgDcJ#L3RzU_qPMYMhCo@ zAtHt$`>6qPt<7k7z}Kq`8wTvh0_y$-o94;d3x+2i?K!~D9pLBQ&>uhd3wrW%2l%-Q zxE8ns@N>VQ#?Ku(e(wH=s`?oYJ#Y4&vl_3Iaw|p37=Oh{o7`oa++<|R!kE$-!r3^V z-^2B!D3N#%SJojjNibvY>)%&T#}6&uir#Te_9s@35`I~$!2TP@gX_YmZ<7`~lNZWWG2 z3pa|SF@FlpkFB%&qQFu>pBJ`Al)r zq%dl-VXGL1D$I(MlrS$3?1x);XoRX1`2(_*?f8j1ow5iz=y{znZ|?!+m|G&8iwTGAN<+|_H2uWcujzDlA!v7}5#M*DL%bF`!TyLAy3;$5KRw6m;2+4gz@4-o R`Un63002ovPDHLkV1kRPTH62s diff --git a/graphics/tileset_anims/anim_mtember_steam_frame0.png b/graphics/tileset_anims/anim_mtember_steam_frame0.png index c63dbf1c427505f86fea40e03761e7b4551323ff..ab0ca2c698a84734162ef7ff710cb36ee13bd8fd 100644 GIT binary patch delta 201 zcmV;)05<=x0onnO8Gi!+008Ny<^KQx05DKYR7Fa2ti{E&tgM`rlzV%7YNV{J|K>q^ zduspx|4Knh?(XKjy|m`$&CSiUw6vt8q?FAv^2GoE0A)!;K~xx(jgP?%z%U2{8Nlqn z4g*lh1C(8gViM(9K8eg3gV|jG^ogz!YI;wp7bFEc79p}NNkVzD(O61Vis74bA>kB$ z#@PRg9fph@CjaA9ym4=gL#G(;>|y4;C(k;_QP!Ow*3me>^mYm(00000NkvXXu0mjf DlwV(9 delta 158 zcmcb`xSnx>WIY2A{1);O1X5+5E{-7*Q(OBF@;V!GI2&`zGQ2cy_#V&B@4)z6zDle8 zM3G!s(W`Sao0qUu_3=y&?hg!qr)R;g))>ov$gt_6#x+B3!+)H)hBLG;Sk69EbNlsv zhHZ-u90>7=T=#j&Z>y(eiB3L>M^eh;-TeQ0eiKcJS^i%<@+<4&gU6g@zi^3woZ{)~ K=d#Wzp$PyNYCfz0 diff --git a/graphics/tileset_anims/anim_mtember_steam_frame1.png b/graphics/tileset_anims/anim_mtember_steam_frame1.png index 8236d28b2bf6bf850a4c16dbdb0e972d9c38f952..1324c7ad5cabbb758b12dade47d76fa38d39f389 100644 GIT binary patch delta 207 zcmV;=05Jcn0pJ0U8Gi!+008Ny<^KQx05DKYR7Fa2ti{E&tgM`rlzV%7YNV{J|K>q^ zduspx|4Knh?(XKjy|m`$&CSiUw6vt8q?FAv^2GoE0BcD^K~xx(ZH~bWz%UE~JpkT+ z9S?vd21s^k8aqT2nJOo1Y>}#+#sQ;v(q~!Hd;ApN&3^cvnF~8(HA(>hWM%*W002ov JPDHLkV1oCdVUhp< delta 154 zcmV;L0A>H+0jmL!8Gir(008?EN)Z460CGu0K~xx(ZI8hXz%U2{J4-qM5+1<&uY(7m z3FOg6<#n>);#`?2Df5~D@-84k1qx$9%^Nspf#mxf_pnMLM)Z#PJ{LXuTxN%m8q^ zduspx|4Knh?(XKjy|m`$&CSiUw6vt8q?FAv^2GoE0A@)0^(R_%^0e2j~FEd?1|G*VHSs}TnY8VeqGedzGrt5pNJOp+k>3bf) zur%ptIekw|Kk3%Qdjn$by5fwyD(%$m2s1+Bz5zcCtZq5uE@07*qoM6N<$ Ef^i03Gynhq delta 156 zcmV;N0Av5#0j&X$8Gir(008?EN)Z460CY)2K~xx(ZIICo#2^eqnI$)XB{G2bUnd@b zOOsSOUCY;#c>%*Zv(_t+ETB9oLB6As9Y7@qHnP~xp|=x?+W{XZqd@XW0Q}dG)Q~50 zbztLcQ*Y&5%W=ulRXKt5zBDVFSc#dpgOB%=JUdPw^ef``6BWM9&c;LY=#qE<0000< KMNUMnLSTZdJwjms diff --git a/graphics/tileset_anims/anim_mtember_steam_frame3.png b/graphics/tileset_anims/anim_mtember_steam_frame3.png index b4f607b5a5b7c4e36f5534d37485b15d2cd39117..a6ec412cf459d2ddc857cb6b011047d234844a79 100644 GIT binary patch delta 208 zcmV;>05AWm0pS6V8Gi!+008Ny<^KQx05DKYR7Fa2ti{E&tgM`rlzV%7YNV{J|K>q^ zduspx|4Knh?(XKjy|m`$&CSiUw6vt8q?FAv^2GoE0BlJ_K~xx(ZI0Ou!!Qg(Jpi@; zIvjukG(fydY*Q_YCjKyl2VP^mJOJcAC@Bt+vP^QCL{$?UlSv>RfQ)HWE%{A$@JH-0jmL!8Gir(008?EN)Z460CGu0K~xx(WslJf#2^eqI}05kQaph7Und^m zuHdwycYGkr*e~Ju^f@*miJXD}YB@lLog8*5q8+Uk1jZD~8d{u~kstB}ZgScA%gpf> zAkQU;lAkL04&Q<_S<0^C9NwpDcorkOE@rtd|6&93S>w9CI}=jLxXo^V+yDRo07*qo IM6N<$f-eQZrd!)UTz3v+2AvXX30H;YrK~xx(RgN(V!!Qg*|0T1e z0Z@!r6i^FgV5(mUkKYNZ1254aDVmK%h>+n1 zmBw2%6E=-_tJnC%s@{q-npyLUp^fu8wFNS?X>1EO_aBX)B1XuGTP$P}kCW6sYSdCm zj4J*gi)#L#T@Ki@g+XW00000NkvXX Hu0mjfzf4z& diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame1.png b/graphics/tileset_anims/anim_silphco_fountain_frame1.png index d5e6d74663a8ef56f765fdae8196aebf2d22c57c..5063c1476e1f0479da71622255bf59ac5a181586 100644 GIT binary patch delta 256 zcmV+b0ssEc0g(cb8Gi!+008Ny<^KQx05DKYR7L*)|58$FdwYA7l%%w@r2qf_)z#IM z&9rl@lxmcV#qR&C)&F~>-eQZrd!)UTz3v+2AvXX30GvrgK~xx(b&o*~gHQ-W=aR0B z7sMD>ZX^vy=*rD+$iG1kApN1BrtPM);RR+0;CTtZz?@K(O?g-wl$_Z~QN-NECKQ*~ z-F!klp<(tM`Hs=k>??ZlkS*9GJ2qfrCSo3-T~D-hifP=5=Cwc{zVv?6027lnVB}DC zYM#*&a^V+_ROpjB;BTs(P|-9&YdlzU5)WPqbCyh<9(@Cr4cqR=*tB*40000rs<36sia6bdi=%F#+b ttwa8{$|;qeWL`Nd{NP1~JlHyS^bO>NBNSiFUmO4c002ovPDHLkV1lkoOxXYc diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame2.png b/graphics/tileset_anims/anim_silphco_fountain_frame2.png index e578cfae7451656872de31e08d80350f4108a6df..eb46683ea93b108a7bce58f0dc044e16c1a087e2 100644 GIT binary patch delta 259 zcmV+e0sQ{e0h9ue8Gi!+008Ny<^KQx05DKYR7L*)|58$FdwYA7l%%w@r2qf_)z#IM z&9rl@lxmcV#qR&C)&F~>-eQZrd!)UTz3v+2AvXX30G~-jK~xx(WsX4#gFp;L|0UfB z9?#9l;Hn!#nKu!nsEwk@j>7b=8?ht0rUQ3y?iY*_N7-|_XU#7iGr!O z*WK0)NwaXw;<${)W@-aERwC95YBnO%7Bx`_K4`8S zk|tl!mLO9;u?b?4_}zHr9F_8aE+v!PrZV7s!%RR!RzO$pgVd_#q>FKxnQ)k3OL3Cz7t|!3joY3==MQbS)CONOmzy zA_O3eC_<`2FRTJp(2P~JRvXN9oYztp@U51yE)0&F>h^Sjl0EFAhDjQ1p=|;WexhaM yL-KcHm9bYO|2ZEy|2#fdY#&v2i5|HeoaGJ0ZzcWhSGRNk0000-eQZrd!)UTz3v+2AvXX30GCNbK~xx(WsgA$!!Qg4_meq= zd{80eluJa=6MD+ULHGxKfK{VfO$%u|r@^}m7Vd9w73PqvY;?j}q2$a?iX`SPHX*q@ zZsrs6DHXFvqmnM0~Z z)QIRXG1;QbjaNB-SU;;T`B~{@b>0<{qZ@MaFHZ*5+M3>X@bCZt002ovPDHLkV1kQ! BdQ|`b delta 187 zcmV;s07UQ|C@{VZpk`(wEEt?DNB|lJquOy1nRZ&ba4#fn3<`x*PxA?B_$Y+ X&J$}f-nq{QXbOX;tDnm{r-UW|f$Kz0 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^96)Tr0wfp|-f{m1Qh}Z>jv*3LlYj8D@ciib>hS2g z&K|E5N_A`JocvJ#^vqm`q;Gj`@te!vw{1{JN{F1WceO)T`nssCU5RP}25;DyIJkAT mab3L-8gZrZs6ma(iCTuEHYes?-BIoYvc%KX&t;ucLK6T+fHQ^w diff --git a/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png b/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png index 52a687e69fca906dcbf35b84720980c24950c056..bfddebccd99450ca3164c11f4f8ba1a6fc763169 100644 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^7C_9w!VDziE-5wuDT4r?5ZC_<|AT_Es;jHFY+3UE z|9^!o&({2Zws&vwyL&+Hma{>Q|C@{VZpk`(wEEt?DNB|lJquOy1nPD5ba4#fn3 Date: Thu, 3 Jun 2021 15:00:52 -0400 Subject: [PATCH 5/5] Reorganize tileset graphics files --- .../primary/general/anim/flower/0.png | Bin .../primary/general/anim/flower/1.png | Bin .../primary/general/anim/flower/2.png | Bin .../primary/general/anim/flower/3.png | Bin .../primary/general/anim/flower/4.png | Bin .../primary/general/anim/sandwatersedge/0.png | Bin .../primary/general/anim/sandwatersedge/1.png | Bin .../primary/general/anim/sandwatersedge/2.png | Bin .../primary/general/anim/sandwatersedge/3.png | Bin .../primary/general/anim/sandwatersedge/4.png | Bin .../primary/general/anim/sandwatersedge/5.png | Bin .../primary/general/anim/sandwatersedge/6.png | Bin .../primary/general/anim/sandwatersedge/7.png | Bin .../anim/water_current_landwatersedge/0.png | Bin .../anim/water_current_landwatersedge/1.png | Bin .../anim/water_current_landwatersedge/2.png | Bin .../anim/water_current_landwatersedge/3.png | Bin .../anim/water_current_landwatersedge/4.png | Bin .../anim/water_current_landwatersedge/5.png | Bin .../anim/water_current_landwatersedge/6.png | Bin .../anim/water_current_landwatersedge/7.png | Bin .../celadon_city/anim/fountain/0.png | Bin .../celadon_city/anim/fountain/1.png | Bin .../celadon_city/anim/fountain/2.png | Bin .../celadon_city/anim/fountain/3.png | Bin .../celadon_city/anim/fountain/4.png | Bin .../secondary/celadon_gym/anim/flowers/0.png | Bin .../secondary/celadon_gym/anim/flowers/1.png | Bin .../secondary/celadon_gym/anim/flowers/2.png | Bin .../secondary/mt_ember/anim/steam/0.png | Bin .../secondary/mt_ember/anim/steam/1.png | Bin .../secondary/mt_ember/anim/steam/2.png | Bin .../secondary/mt_ember/anim/steam/3.png | Bin .../secondary/silph_co/anim/fountain/0.png | Bin .../secondary/silph_co/anim/fountain/1.png | Bin .../secondary/silph_co/anim/fountain/2.png | Bin .../secondary/silph_co/anim/fountain/3.png | Bin .../vermilion_gym/anim/motorizeddoor/0.png | Bin .../vermilion_gym/anim/motorizeddoor/1.png | Bin graphics_file_rules.mk | 3 +- src/tileset_anims.c | 78 +++++++++--------- 41 files changed, 40 insertions(+), 41 deletions(-) rename graphics/tileset_anims/anim_general_flower_frame0.png => data/tilesets/primary/general/anim/flower/0.png (100%) rename graphics/tileset_anims/anim_general_flower_frame1.png => data/tilesets/primary/general/anim/flower/1.png (100%) rename graphics/tileset_anims/anim_general_flower_frame2.png => data/tilesets/primary/general/anim/flower/2.png (100%) rename graphics/tileset_anims/anim_general_flower_frame3.png => data/tilesets/primary/general/anim/flower/3.png (100%) rename graphics/tileset_anims/anim_general_flower_frame4.png => data/tilesets/primary/general/anim/flower/4.png (100%) rename graphics/tileset_anims/anim_general_sandwatersedge_frame0.png => data/tilesets/primary/general/anim/sandwatersedge/0.png (100%) rename graphics/tileset_anims/anim_general_sandwatersedge_frame1.png => data/tilesets/primary/general/anim/sandwatersedge/1.png (100%) rename graphics/tileset_anims/anim_general_sandwatersedge_frame2.png => data/tilesets/primary/general/anim/sandwatersedge/2.png (100%) rename graphics/tileset_anims/anim_general_sandwatersedge_frame3.png => data/tilesets/primary/general/anim/sandwatersedge/3.png (100%) rename graphics/tileset_anims/anim_general_sandwatersedge_frame4.png => data/tilesets/primary/general/anim/sandwatersedge/4.png (100%) rename graphics/tileset_anims/anim_general_sandwatersedge_frame5.png => data/tilesets/primary/general/anim/sandwatersedge/5.png (100%) rename graphics/tileset_anims/anim_general_sandwatersedge_frame6.png => data/tilesets/primary/general/anim/sandwatersedge/6.png (100%) rename graphics/tileset_anims/anim_general_sandwatersedge_frame7.png => data/tilesets/primary/general/anim/sandwatersedge/7.png (100%) rename graphics/tileset_anims/anim_general_water_current_landwatersedge_frame0.png => data/tilesets/primary/general/anim/water_current_landwatersedge/0.png (100%) rename graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png => data/tilesets/primary/general/anim/water_current_landwatersedge/1.png (100%) rename graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png => data/tilesets/primary/general/anim/water_current_landwatersedge/2.png (100%) rename graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png => data/tilesets/primary/general/anim/water_current_landwatersedge/3.png (100%) rename graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.png => data/tilesets/primary/general/anim/water_current_landwatersedge/4.png (100%) rename graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png => data/tilesets/primary/general/anim/water_current_landwatersedge/5.png (100%) rename graphics/tileset_anims/anim_general_water_current_landwatersedge_frame6.png => data/tilesets/primary/general/anim/water_current_landwatersedge/6.png (100%) rename graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.png => data/tilesets/primary/general/anim/water_current_landwatersedge/7.png (100%) rename graphics/tileset_anims/anim_celadoncity_fountain_frame0.png => data/tilesets/secondary/celadon_city/anim/fountain/0.png (100%) rename graphics/tileset_anims/anim_celadoncity_fountain_frame1.png => data/tilesets/secondary/celadon_city/anim/fountain/1.png (100%) rename graphics/tileset_anims/anim_celadoncity_fountain_frame2.png => data/tilesets/secondary/celadon_city/anim/fountain/2.png (100%) rename graphics/tileset_anims/anim_celadoncity_fountain_frame3.png => data/tilesets/secondary/celadon_city/anim/fountain/3.png (100%) rename graphics/tileset_anims/anim_celadoncity_fountain_frame4.png => data/tilesets/secondary/celadon_city/anim/fountain/4.png (100%) rename graphics/tileset_anims/anim_celadongym_flowers_frame0.png => data/tilesets/secondary/celadon_gym/anim/flowers/0.png (100%) rename graphics/tileset_anims/anim_celadongym_flowers_frame1.png => data/tilesets/secondary/celadon_gym/anim/flowers/1.png (100%) rename graphics/tileset_anims/anim_celadongym_flowers_frame2.png => data/tilesets/secondary/celadon_gym/anim/flowers/2.png (100%) rename graphics/tileset_anims/anim_mtember_steam_frame0.png => data/tilesets/secondary/mt_ember/anim/steam/0.png (100%) rename graphics/tileset_anims/anim_mtember_steam_frame1.png => data/tilesets/secondary/mt_ember/anim/steam/1.png (100%) rename graphics/tileset_anims/anim_mtember_steam_frame2.png => data/tilesets/secondary/mt_ember/anim/steam/2.png (100%) rename graphics/tileset_anims/anim_mtember_steam_frame3.png => data/tilesets/secondary/mt_ember/anim/steam/3.png (100%) rename graphics/tileset_anims/anim_silphco_fountain_frame0.png => data/tilesets/secondary/silph_co/anim/fountain/0.png (100%) rename graphics/tileset_anims/anim_silphco_fountain_frame1.png => data/tilesets/secondary/silph_co/anim/fountain/1.png (100%) rename graphics/tileset_anims/anim_silphco_fountain_frame2.png => data/tilesets/secondary/silph_co/anim/fountain/2.png (100%) rename graphics/tileset_anims/anim_silphco_fountain_frame3.png => data/tilesets/secondary/silph_co/anim/fountain/3.png (100%) rename graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame0.png => data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png (100%) rename graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png => data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png (100%) diff --git a/graphics/tileset_anims/anim_general_flower_frame0.png b/data/tilesets/primary/general/anim/flower/0.png similarity index 100% rename from graphics/tileset_anims/anim_general_flower_frame0.png rename to data/tilesets/primary/general/anim/flower/0.png diff --git a/graphics/tileset_anims/anim_general_flower_frame1.png b/data/tilesets/primary/general/anim/flower/1.png similarity index 100% rename from graphics/tileset_anims/anim_general_flower_frame1.png rename to data/tilesets/primary/general/anim/flower/1.png diff --git a/graphics/tileset_anims/anim_general_flower_frame2.png b/data/tilesets/primary/general/anim/flower/2.png similarity index 100% rename from graphics/tileset_anims/anim_general_flower_frame2.png rename to data/tilesets/primary/general/anim/flower/2.png diff --git a/graphics/tileset_anims/anim_general_flower_frame3.png b/data/tilesets/primary/general/anim/flower/3.png similarity index 100% rename from graphics/tileset_anims/anim_general_flower_frame3.png rename to data/tilesets/primary/general/anim/flower/3.png diff --git a/graphics/tileset_anims/anim_general_flower_frame4.png b/data/tilesets/primary/general/anim/flower/4.png similarity index 100% rename from graphics/tileset_anims/anim_general_flower_frame4.png rename to data/tilesets/primary/general/anim/flower/4.png diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame0.png b/data/tilesets/primary/general/anim/sandwatersedge/0.png similarity index 100% rename from graphics/tileset_anims/anim_general_sandwatersedge_frame0.png rename to data/tilesets/primary/general/anim/sandwatersedge/0.png diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame1.png b/data/tilesets/primary/general/anim/sandwatersedge/1.png similarity index 100% rename from graphics/tileset_anims/anim_general_sandwatersedge_frame1.png rename to data/tilesets/primary/general/anim/sandwatersedge/1.png diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame2.png b/data/tilesets/primary/general/anim/sandwatersedge/2.png similarity index 100% rename from graphics/tileset_anims/anim_general_sandwatersedge_frame2.png rename to data/tilesets/primary/general/anim/sandwatersedge/2.png diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame3.png b/data/tilesets/primary/general/anim/sandwatersedge/3.png similarity index 100% rename from graphics/tileset_anims/anim_general_sandwatersedge_frame3.png rename to data/tilesets/primary/general/anim/sandwatersedge/3.png diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame4.png b/data/tilesets/primary/general/anim/sandwatersedge/4.png similarity index 100% rename from graphics/tileset_anims/anim_general_sandwatersedge_frame4.png rename to data/tilesets/primary/general/anim/sandwatersedge/4.png diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame5.png b/data/tilesets/primary/general/anim/sandwatersedge/5.png similarity index 100% rename from graphics/tileset_anims/anim_general_sandwatersedge_frame5.png rename to data/tilesets/primary/general/anim/sandwatersedge/5.png diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame6.png b/data/tilesets/primary/general/anim/sandwatersedge/6.png similarity index 100% rename from graphics/tileset_anims/anim_general_sandwatersedge_frame6.png rename to data/tilesets/primary/general/anim/sandwatersedge/6.png diff --git a/graphics/tileset_anims/anim_general_sandwatersedge_frame7.png b/data/tilesets/primary/general/anim/sandwatersedge/7.png similarity index 100% rename from graphics/tileset_anims/anim_general_sandwatersedge_frame7.png rename to data/tilesets/primary/general/anim/sandwatersedge/7.png diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame0.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/0.png similarity index 100% rename from graphics/tileset_anims/anim_general_water_current_landwatersedge_frame0.png rename to data/tilesets/primary/general/anim/water_current_landwatersedge/0.png diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/1.png similarity index 100% rename from graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.png rename to data/tilesets/primary/general/anim/water_current_landwatersedge/1.png diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/2.png similarity index 100% rename from graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.png rename to data/tilesets/primary/general/anim/water_current_landwatersedge/2.png diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/3.png similarity index 100% rename from graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.png rename to data/tilesets/primary/general/anim/water_current_landwatersedge/3.png diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/4.png similarity index 100% rename from graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.png rename to data/tilesets/primary/general/anim/water_current_landwatersedge/4.png diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/5.png similarity index 100% rename from graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.png rename to data/tilesets/primary/general/anim/water_current_landwatersedge/5.png diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame6.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/6.png similarity index 100% rename from graphics/tileset_anims/anim_general_water_current_landwatersedge_frame6.png rename to data/tilesets/primary/general/anim/water_current_landwatersedge/6.png diff --git a/graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/7.png similarity index 100% rename from graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.png rename to data/tilesets/primary/general/anim/water_current_landwatersedge/7.png diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame0.png b/data/tilesets/secondary/celadon_city/anim/fountain/0.png similarity index 100% rename from graphics/tileset_anims/anim_celadoncity_fountain_frame0.png rename to data/tilesets/secondary/celadon_city/anim/fountain/0.png diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame1.png b/data/tilesets/secondary/celadon_city/anim/fountain/1.png similarity index 100% rename from graphics/tileset_anims/anim_celadoncity_fountain_frame1.png rename to data/tilesets/secondary/celadon_city/anim/fountain/1.png diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame2.png b/data/tilesets/secondary/celadon_city/anim/fountain/2.png similarity index 100% rename from graphics/tileset_anims/anim_celadoncity_fountain_frame2.png rename to data/tilesets/secondary/celadon_city/anim/fountain/2.png diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame3.png b/data/tilesets/secondary/celadon_city/anim/fountain/3.png similarity index 100% rename from graphics/tileset_anims/anim_celadoncity_fountain_frame3.png rename to data/tilesets/secondary/celadon_city/anim/fountain/3.png diff --git a/graphics/tileset_anims/anim_celadoncity_fountain_frame4.png b/data/tilesets/secondary/celadon_city/anim/fountain/4.png similarity index 100% rename from graphics/tileset_anims/anim_celadoncity_fountain_frame4.png rename to data/tilesets/secondary/celadon_city/anim/fountain/4.png diff --git a/graphics/tileset_anims/anim_celadongym_flowers_frame0.png b/data/tilesets/secondary/celadon_gym/anim/flowers/0.png similarity index 100% rename from graphics/tileset_anims/anim_celadongym_flowers_frame0.png rename to data/tilesets/secondary/celadon_gym/anim/flowers/0.png diff --git a/graphics/tileset_anims/anim_celadongym_flowers_frame1.png b/data/tilesets/secondary/celadon_gym/anim/flowers/1.png similarity index 100% rename from graphics/tileset_anims/anim_celadongym_flowers_frame1.png rename to data/tilesets/secondary/celadon_gym/anim/flowers/1.png diff --git a/graphics/tileset_anims/anim_celadongym_flowers_frame2.png b/data/tilesets/secondary/celadon_gym/anim/flowers/2.png similarity index 100% rename from graphics/tileset_anims/anim_celadongym_flowers_frame2.png rename to data/tilesets/secondary/celadon_gym/anim/flowers/2.png diff --git a/graphics/tileset_anims/anim_mtember_steam_frame0.png b/data/tilesets/secondary/mt_ember/anim/steam/0.png similarity index 100% rename from graphics/tileset_anims/anim_mtember_steam_frame0.png rename to data/tilesets/secondary/mt_ember/anim/steam/0.png diff --git a/graphics/tileset_anims/anim_mtember_steam_frame1.png b/data/tilesets/secondary/mt_ember/anim/steam/1.png similarity index 100% rename from graphics/tileset_anims/anim_mtember_steam_frame1.png rename to data/tilesets/secondary/mt_ember/anim/steam/1.png diff --git a/graphics/tileset_anims/anim_mtember_steam_frame2.png b/data/tilesets/secondary/mt_ember/anim/steam/2.png similarity index 100% rename from graphics/tileset_anims/anim_mtember_steam_frame2.png rename to data/tilesets/secondary/mt_ember/anim/steam/2.png diff --git a/graphics/tileset_anims/anim_mtember_steam_frame3.png b/data/tilesets/secondary/mt_ember/anim/steam/3.png similarity index 100% rename from graphics/tileset_anims/anim_mtember_steam_frame3.png rename to data/tilesets/secondary/mt_ember/anim/steam/3.png diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame0.png b/data/tilesets/secondary/silph_co/anim/fountain/0.png similarity index 100% rename from graphics/tileset_anims/anim_silphco_fountain_frame0.png rename to data/tilesets/secondary/silph_co/anim/fountain/0.png diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame1.png b/data/tilesets/secondary/silph_co/anim/fountain/1.png similarity index 100% rename from graphics/tileset_anims/anim_silphco_fountain_frame1.png rename to data/tilesets/secondary/silph_co/anim/fountain/1.png diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame2.png b/data/tilesets/secondary/silph_co/anim/fountain/2.png similarity index 100% rename from graphics/tileset_anims/anim_silphco_fountain_frame2.png rename to data/tilesets/secondary/silph_co/anim/fountain/2.png diff --git a/graphics/tileset_anims/anim_silphco_fountain_frame3.png b/data/tilesets/secondary/silph_co/anim/fountain/3.png similarity index 100% rename from graphics/tileset_anims/anim_silphco_fountain_frame3.png rename to data/tilesets/secondary/silph_co/anim/fountain/3.png diff --git a/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame0.png b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png similarity index 100% rename from graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame0.png rename to data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png diff --git a/graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png similarity index 100% rename from graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.png rename to data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index d96845bba..dbb583269 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -28,7 +28,6 @@ INTROGFXDIR := graphics/intro BATTLETERRAINGFXDIR := graphics/battle_terrain BERRYPOUCHGFXDIR := graphics/berry_pouch HALLOFFAMEGFXDIR := graphics/hall_of_fame -TILESETANIMSGFXDIR := graphics/tileset_anims types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -592,5 +591,5 @@ $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png $(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 29 -$(TILESETANIMSGFXDIR)/anim_general_water_current_landwatersedge_frame7.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/primary/general/anim/water_current_landwatersedge/7.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 47 diff --git a/src/tileset_anims.c b/src/tileset_anims.c index abd0d80e1..fcf6a6038 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -18,11 +18,11 @@ static void _InitPrimaryTilesetAnimation(void); static void _InitSecondaryTilesetAnimation(void); // palette: general 00 -static const u16 sTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame0.4bpp"); -static const u16 sTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame1.4bpp"); -static const u16 sTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame2.4bpp"); -static const u16 sTilesetAnims_General_Flower_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame3.4bpp"); -static const u16 sTilesetAnims_General_Flower_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_general_flower_frame4.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/0.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/1.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/2.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/3.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/4.4bpp"); static const u16 *const sTilesetAnims_General_Flower[] = { sTilesetAnims_General_Flower_Frame0, @@ -33,14 +33,14 @@ static const u16 *const sTilesetAnims_General_Flower[] = { }; // palette: general 04 -static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame0.4bpp"); -static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame1.4bpp"); -static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame2.4bpp"); -static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame3.4bpp"); -static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame4.4bpp"); -static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame5.4bpp"); -static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame6.4bpp"); -static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7[] = INCBIN_U16("graphics/tileset_anims/anim_general_water_current_landwatersedge_frame7.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/0.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/1.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/2.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/3.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/4.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/5.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/6.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/7.4bpp"); static const u16 *const sTilesetAnims_General_Water_Current_LandWatersEdge[] = { sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0, @@ -54,14 +54,14 @@ static const u16 *const sTilesetAnims_General_Water_Current_LandWatersEdge[] = { }; // palette: general 04 -static const u16 sTilesetAnims_General_SandWatersEdge_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame0.4bpp"); -static const u16 sTilesetAnims_General_SandWatersEdge_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame1.4bpp"); -static const u16 sTilesetAnims_General_SandWatersEdge_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame2.4bpp"); -static const u16 sTilesetAnims_General_SandWatersEdge_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame3.4bpp"); -static const u16 sTilesetAnims_General_SandWatersEdge_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame4.4bpp"); -static const u16 sTilesetAnims_General_SandWatersEdge_Frame5[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame5.4bpp"); -static const u16 sTilesetAnims_General_SandWatersEdge_Frame6[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame6.4bpp"); -static const u16 sTilesetAnims_General_SandWatersEdge_Frame7[] = INCBIN_U16("graphics/tileset_anims/anim_general_sandwatersedge_frame7.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/0.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/1.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/2.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/3.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/4.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/5.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/6.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/7.4bpp"); static const u16 *const sTilesetAnims_General_SandWatersEdge[] = { sTilesetAnims_General_SandWatersEdge_Frame0, @@ -75,11 +75,11 @@ static const u16 *const sTilesetAnims_General_SandWatersEdge[] = { }; // palette: general 00 -static const u16 sTilesetAnims_CeladonCity_Fountain_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame0.4bpp"); -static const u16 sTilesetAnims_CeladonCity_Fountain_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame1.4bpp"); -static const u16 sTilesetAnims_CeladonCity_Fountain_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame2.4bpp"); -static const u16 sTilesetAnims_CeladonCity_Fountain_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame3.4bpp"); -static const u16 sTilesetAnims_CeladonCity_Fountain_Frame4[] = INCBIN_U16("graphics/tileset_anims/anim_celadoncity_fountain_frame4.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/0.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/1.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame2[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/2.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame3[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/3.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame4[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/4.4bpp"); static const u16 gUnknown_83ABD94[16] = {}; static const u16 *const sTilesetAnims_CeladonCity_Fountain[] = { @@ -90,10 +90,10 @@ static const u16 *const sTilesetAnims_CeladonCity_Fountain[] = { sTilesetAnims_CeladonCity_Fountain_Frame4 }; -static const u16 sTilesetAnims_SilphCo_Fountain_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_silphco_fountain_frame0.4bpp"); -static const u16 sTilesetAnims_SilphCo_Fountain_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_silphco_fountain_frame1.4bpp"); -static const u16 sTilesetAnims_SilphCo_Fountain_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_silphco_fountain_frame2.4bpp"); -static const u16 sTilesetAnims_SilphCo_Fountain_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_silphco_fountain_frame3.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/0.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/1.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame2[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/2.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame3[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/3.4bpp"); static const u16 gUnknown_83AC1C8[16] = {}; static const u16 *const sTilesetAnims_SilphCo_Fountain[] = { @@ -103,10 +103,10 @@ static const u16 *const sTilesetAnims_SilphCo_Fountain[] = { sTilesetAnims_SilphCo_Fountain_Frame3 }; -static const u16 sTilesetAnims_MtEmber_Steam_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_mtember_steam_frame0.4bpp"); -static const u16 sTilesetAnims_MtEmber_Steam_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_mtember_steam_frame1.4bpp"); -static const u16 sTilesetAnims_MtEmber_Steam_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_mtember_steam_frame2.4bpp"); -static const u16 sTilesetAnims_MtEmber_Steam_Frame3[] = INCBIN_U16("graphics/tileset_anims/anim_mtember_steam_frame3.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame0[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/0.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame1[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/1.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame2[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/2.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame3[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/3.4bpp"); static const u16 *const sTilesetAnims_MtEmber_Steam[] = { sTilesetAnims_MtEmber_Steam_Frame0, @@ -115,17 +115,17 @@ static const u16 *const sTilesetAnims_MtEmber_Steam[] = { sTilesetAnims_MtEmber_Steam_Frame3 }; -static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame0.4bpp"); -static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_vermiliongym_motorizeddoor_frame1.4bpp"); +static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame0[] = INCBIN_U16("data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.4bpp"); +static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame1[] = INCBIN_U16("data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.4bpp"); static const u16 *const sTilesetAnims_VermilionGym_MotorizedDoor[] = { sTilesetAnims_VermilionGym_MotorizedDoor_Frame0, sTilesetAnims_VermilionGym_MotorizedDoor_Frame1 }; -static const u16 sTilesetAnims_CeladonGym_Flowers_Frame0[] = INCBIN_U16("graphics/tileset_anims/anim_celadongym_flowers_frame0.4bpp"); -static const u16 sTilesetAnims_CeladonGym_Flowers_Frame1[] = INCBIN_U16("graphics/tileset_anims/anim_celadongym_flowers_frame1.4bpp"); -static const u16 sTilesetAnims_CeladonGym_Flowers_Frame2[] = INCBIN_U16("graphics/tileset_anims/anim_celadongym_flowers_frame2.4bpp"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame0[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/0.4bpp"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame1[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/1.4bpp"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame2[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/2.4bpp"); static const u16 *const sTilesetAnims_CeladonGym_Flowers[] = { sTilesetAnims_CeladonGym_Flowers_Frame0,