Duraludon battle animation (#6086)

rh-hideout · Jan 26, 2025 · 37b6f03 · 37b6f03
1 parent 99c24c5
commit 37b6f03
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/graphics/pokemon/duraludon/anim_front.png b/graphics/pokemon/duraludon/anim_front.png
diff --git a/graphics/pokemon/duraludon/front.png b/graphics/pokemon/duraludon/front.png
diff --git a/graphics/pokemon/duraludon/shiny.pal b/graphics/pokemon/duraludon/shiny.pal
@@ -8,7 +8,7 @@ JASC-PAL
 16 16 16
 81 96 101
 226 157 109
-253 248 236
+242 211 111
 118 138 154
 149 163 164
 8 36 82

diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
@@ -24186,7 +24186,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
 #endif //P_FAMILY_ARCTOVISH
 
 #if P_FAMILY_DURALUDON
-    const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/front.4bpp.lz");
+    const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/anim_front.4bpp.lz");
     const u32 gMonPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/normal.gbapal.lz");
     const u32 gMonBackPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/back.4bpp.lz");
     const u32 gMonShinyPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/shiny.gbapal.lz");

diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h
@@ -5988,7 +5988,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
         .frontPicSize = MON_COORDS_SIZE(56, 64),
         .frontPicYOffset = 0,
         .frontAnimFrames = sAnims_Duraludon,
-        //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
+        .frontAnimId = ANIM_SHAKE_FLASH_YELLOW_FAST,
         .backPic = gMonBackPic_Duraludon,
         .backPicSize = MON_COORDS_SIZE(64, 64),
         .backPicYOffset = 0,

diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
@@ -9737,7 +9737,14 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Arctovish);
 #endif //P_FAMILY_ARCTOVISH
 
 #if P_FAMILY_DURALUDON
-PLACEHOLDER_ANIM_SINGLE_FRAME(Duraludon);
+static const union AnimCmd sAnim_Duraludon_1[] =
+{
+
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(1, 60),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_END,
+};
 
 #if P_GIGANTAMAX_FORMS
 PLACEHOLDER_ANIM_SINGLE_FRAME(DuraludonGmax);
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ JASC-PAL @@
 16 16
 96 101
 157 109
-248 236
+211 111
 138 154
 163 164
 36 82
@@ Expand Down @@