From 9d483cee5d46116043762197210edfb3b4af61b5 Mon Sep 17 00:00:00 2001 From: Liamjd14 Date: Sat, 14 Sep 2024 19:21:34 +0100 Subject: [PATCH] Enable asym for followers issue #5382 (#5385) * Applies asym code to followers galarian slowbro tinkaton line scovillain --- graphics/pokemon/scovillain/overworld.png | Bin 1337 -> 1338 bytes .../pokemon/slowbro/galarian/overworld.png | Bin 1099 -> 1096 bytes graphics/pokemon/tinkaton/overworld.png | Bin 1606 -> 1587 bytes .../pokemon/species_info/gen_1_families.h | 3 ++- .../pokemon/species_info/gen_9_families.h | 16 ++++++++-------- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/graphics/pokemon/scovillain/overworld.png b/graphics/pokemon/scovillain/overworld.png index ed7dfcaedc9b6ae55f1af184e552e0bc06e7ba88..6eb5fac3e42c23de2b395877a3dc18716dc363af 100644 GIT binary patch delta 1245 zcmV<31S0#n3c3oAZGX5)L_t(&f$dm}lH({0G(on&ul)btUQ1vb%)^pG6pH2qNp%)MID z(On|^<=r6pq)#&X3|GPatOCYZ)cU%rB^oExGGLr|O&lkz_xowXWXf5Iv{Z9nGqO7K4nGP| zI7HW2M0}CttvKaDpAQ%wMC`IGWM6X@zNjVgd8N7~`YPb7mwa5umbFL8+SUuLUL3aKZJm$2jIu8%JS*zOD$&S6$q zaA;)4d4Gut+z1XF7|Lguz?Q-pL6(P7ptHkhu?ivv&^>-WH1v$11kW6T42(+*HPI9f zI?nmSAUA!=JwP{xSBpxtFVky~3%@%=Vd)q& zl5no_oD+iteX9H;MP*pDIMnF$OqV37H#BzaupF*(Kxrkn>ePe*FB~!)9rpUF^Uv_k z9~R*mQN#!akwdDEBl@<<7iGhh7AJVUG=J^z>O>`Stv{1ayl}{ggI;%i7Z0TzHY@5M zv@1<~b51VSZrxj);nlPlE228*kfB~-f)@^nI38{|L)z=RcpTAYKgRK-m#e+*0Y`y; zg|rTz4FZoixZy>=#Lr5_X02`1#+j-|$H%x-xNhG2t@+=iN1Qf~7dLTMoF4ucvwvcT zd&kZFTEX!Q39X{bPK`ktFxlhH;+oSm3_x z*xTE?aZo72j9CqW`z9bNYpsuXWBnCp=MMiWt_*o^Mt;I$fo}xm{k=B`D6)410z+`z zo9lsWI;&R(4rJs3%LWWL?{D-W$5s(qmo*jG!?JGTK%F|zaT>Y;p$gQ{TMxV`&^7Pf zKLe>cf$7~oH;xGpi5r{uRzO#vhZMlu>ytpgnee++|NHR|BEUe^wlI1C00000NkvXX Hu0mjf!mdVz delta 1244 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 diff --git a/graphics/pokemon/tinkaton/overworld.png b/graphics/pokemon/tinkaton/overworld.png index 702afdab9dde80da17c64aa28814a6e310c4eeb6..382f3b4200e797e5919151d171553f3cbf56dc68 100644 GIT binary patch delta 1496 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 R&#V9d002ovPDHLkV1k!$_Vxe( diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index 0acdc9dada..7082e64464 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -9176,11 +9176,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_SlowbroGalarian, .iconPalIndex = 0, FOOTPRINT(Slowbro) - OVERWORLD( + OVERWORLD_SET_ANIM( sPicTable_SlowbroGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, + sAnimTable_Following_Asym, gOverworldPalette_SlowbroGalarian, gShinyOverworldPalette_SlowbroGalarian ) diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index 554c0c1d9b..650b3c5a07 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -3215,12 +3215,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_Scovillain, .iconPalIndex = 1, FOOTPRINT(Scovillain) - OVERWORLD( + OVERWORLD_SET_ANIM( sPicTable_Scovillain, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - //sAnimTable_Following_Asym, + sAnimTable_Following_Asym, gOverworldPalette_Scovillain, gShinyOverworldPalette_Scovillain ) @@ -3526,12 +3526,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_Tinkatink, .iconPalIndex = 1, FOOTPRINT(Tinkatink) - OVERWORLD( + OVERWORLD_SET_ANIM( sPicTable_Tinkatink, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, - //sAnimTable_Following_Asym, + sAnimTable_Following_Asym, gOverworldPalette_Tinkatink, gShinyOverworldPalette_Tinkatink ) @@ -3589,12 +3589,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_Tinkatuff, .iconPalIndex = 1, FOOTPRINT(Tinkatuff) - OVERWORLD( + OVERWORLD_SET_ANIM( sPicTable_Tinkatuff, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, - //sAnimTable_Following_Asym, + sAnimTable_Following_Asym, gOverworldPalette_Tinkatuff, gShinyOverworldPalette_Tinkatuff ) @@ -3651,12 +3651,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_Tinkaton, .iconPalIndex = 1, FOOTPRINT(Tinkaton) - OVERWORLD( + OVERWORLD_SET_ANIM( sPicTable_Tinkaton, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - //sAnimTable_Following_Asym, + sAnimTable_Following_Asym, gOverworldPalette_Tinkaton, gShinyOverworldPalette_Tinkaton )