Multiple fixes (see commit description)

- New Eternatus 32x32 sprite by Gerben BSc - Fixed missing Hero Zamazenta sprite - Fixed missing Single Strike Urshifu sprite - Moved Alcremie Strawberry sprite to respective folder
2024-05-11 19:09:05 -04:00 · 2024-05-11 19:09:05 -04:00 · 45ee5b5c8f
commit 45ee5b5c8f
parent aa81f30742
18 changed files with 139 additions and 123 deletions
--- a/graphics/pokemon/alcremie/follow_shiny.pal
+++ b/graphics/pokemon/alcremie/follow_shiny.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 255 255
-183 121 128
-0 0 0
-253 228 208
-242 138 149
-138 32 57
-254 114 114
-224 175 187
-183 60 60
-16 16 16
-10 10 10
-11 11 11
-12 12 12
-13 13 13
-14 14 14
-15 15 15
--- a/graphics/pokemon/alcremie/follower.png
+++ b/graphics/pokemon/alcremie/follower.png
--- a/graphics/pokemon/alcremie/strawberry/follow_normal.pal
+++ b/graphics/pokemon/alcremie/strawberry/follow_normal.pal
@ -1,7 +1,7 @@
 JASC-PAL
 0100
 16
-255 255 255
+34 177 76
 183 121 128
 0 0 0
 253 228 208
@ -11,9 +11,9 @@ JASC-PAL
 224 175 187
 183 60 60
 16 16 16
-10 10 10
-11 11 11
-12 12 12
-13 13 13
-14 14 14
-15 15 15
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
--- a/graphics/pokemon/alcremie/strawberry/follow_shiny.pal
+++ b/graphics/pokemon/alcremie/strawberry/follow_shiny.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+74 82 74
+0 0 0
+164 172 164
+90 90 98
+139 32 57
+255 115 115
+230 230 230
+180 57 57
+16 16 16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
--- a/graphics/pokemon/alcremie/strawberry/follower.png
+++ b/graphics/pokemon/alcremie/strawberry/follower.png
--- a/graphics/pokemon/eternatus/follow_normal.pal
+++ b/graphics/pokemon/eternatus/follow_normal.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
+0 252 32
+0 0 0
+4 40 124
+164 28 64
+252 68 120
+32 76 176
+60 0 16
+204 32 80
+228 168 168
+164 28 64
+96 0 28
+252 68 120
+0 0 0
+0 0 0
 0 0 0
-61 0 17
-33 77 179
 0 0 0
-254 71 122
-7 43 126
-167 28 67
-160 65 104
-107 37 66
-207 117 182
-235 150 211
-11 11 11
-12 12 12
-13 13 13
-14 14 14
-15 15 15
--- a/graphics/pokemon/eternatus/follow_shiny.pal
+++ b/graphics/pokemon/eternatus/follow_shiny.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
+152 208 160
+0 0 0
+104 32 104
+176 24 48
+240 104 112
+168 24 168
+152 32 48
+248 32 80
+248 184 184
+248 32 80
+152 32 48
+232 16 48
+0 0 0
+0 0 0
 0 0 0
-61 0 17
-33 77 179
 0 0 0
-254 71 122
-7 43 126
-167 28 67
-160 65 104
-107 37 66
-207 117 182
-235 150 211
-11 11 11
-12 12 12
-13 13 13
-14 14 14
-15 15 15
--- a/graphics/pokemon/eternatus/follower.png
+++ b/graphics/pokemon/eternatus/follower.png
--- a/graphics/pokemon/urshifu/follow_normal.pal
+++ b/graphics/pokemon/urshifu/follow_normal.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-129 199 151
-29 29 29
+152 208 160
+16 16 16
+248 248 248
+184 184 184
+72 72 88
+104 96 112
+64 64 56
+208 168 32
+248 248 96
+16 16 16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
 0 0 0
-255 255 255
-207 207 207
-128 128 128
-18 18 19
-75 74 79
-110 110 112
-5 5 5
-61 61 61
-161 161 74
-240 237 81
-13 13 13
-14 14 14
-15 15 15
--- a/graphics/pokemon/urshifu/follow_shiny.pal
+++ b/graphics/pokemon/urshifu/follow_shiny.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-129 199 151
-29 29 29
+152 208 160
 0 0 0
 255 255 255
-207 207 207
-128 128 128
-18 18 19
-75 74 79
-110 110 112
-5 5 5
-61 61 61
-161 161 74
-240 237 81
-13 13 13
-14 14 14
-15 15 15
+205 205 205
+106 98 115
+139 139 139
+98 90 74
+189 90 32
+255 148 49
+41 41 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
--- a/graphics/pokemon/urshifu/follower.png
+++ b/graphics/pokemon/urshifu/follower.png
--- a/graphics/pokemon/zamazenta/follow_normal.pal
+++ b/graphics/pokemon/zamazenta/follow_normal.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-131 129 131
-197 198 205
-172 174 189
-205 44 57
-90 12 16
-148 157 172
-238 206 139
-255 234 213
-32 48 115
-24 44 98
-164 32 41
-32 32 32
-41 64 148
+0 252 252
 0 0 0
-213 214 222
-230 226 230
+88 12 20
+28 44 108
+20 32 76
+164 32 44
+204 44 56
+0 0 0
+32 32 32
+0 0 0
+216 208 32
+40 64 148
+208 208 208
+152 156 172
+236 204 136
+208 208 208
--- a/graphics/pokemon/zamazenta/follow_shiny.pal
+++ b/graphics/pokemon/zamazenta/follow_shiny.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-131 129 131
-197 198 205
-172 174 189
-205 44 57
-90 12 16
-148 157 172
-238 206 139
-255 234 213
-32 48 115
-24 44 98
-164 32 41
-32 32 32
-41 64 148
+152 208 160
 0 0 0
-213 214 222
-230 226 230
+57 16 41
+82 0 32
+32 0 8
+123 41 98
+180 74 139
+0 0 0
+32 0 8
+0 0 0
+222 213 32
+148 16 57
+230 230 230
+148 156 172
+238 205 139
+197 197 205
--- a/graphics/pokemon/zamazenta/follower.png
+++ b/graphics/pokemon/zamazenta/follower.png
--- a/spritesheet_rules.mk
+++ b/spritesheet_rules.mk
@ -3447,7 +3447,7 @@ $(POKEMONGFXDIR)/runerigus/follower.4bpp: %.4bpp: %.png
 $(POKEMONGFXDIR)/milcery/follower.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4

-$(POKEMONGFXDIR)/alcremie/follower.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/alcremie/strawberry/follower.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4

 $(POKEMONGFXDIR)/falinks/follower.4bpp: %.4bpp: %.png
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@ -19147,10 +19147,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
    const u32 gMonShinyPalette_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_shiny.gbapal.lz");

 #if OW_FOLLOWERS_ENABLED
-    const u32 gObjectEventPic_AlcremieStrawberryVanillaCream[] = INCBIN_COMP("graphics/pokemon/alcremie/follower.4bpp");
+    const u32 gObjectEventPic_AlcremieStrawberry[] = INCBIN_COMP("graphics/pokemon/alcremie/strawberry/follower.4bpp");
 #if OW_FOLLOWERS_SHARE_PALETTE == FALSE
-    const u32 gFollowerPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/follow_normal.gbapal.lz");
-    const u32 gShinyFollowerPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/follow_shiny.gbapal.lz");
+    const u32 gFollowerPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/follow_normal.gbapal.lz");
+    const u32 gShinyFollowerPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/follow_shiny.gbapal.lz");
 #endif //OW_FOLLOWERS_SHARE_PALETTE
 #endif //OW_FOLLOWERS_ENABLED

--- a/src/data/object_events/object_event_pic_tables_followers.h
+++ b/src/data/object_events/object_event_pic_tables_followers.h
@ -5327,8 +5327,8 @@ static const struct SpriteFrameImage sPicTable_Milcery[] = {
    overworld_ascending_frames(gObjectEventPic_Milcery, 4, 4),
 };

-static const struct SpriteFrameImage sPicTable_AlcremieStrawberryVanillaCream[] = {
-    overworld_ascending_frames(gObjectEventPic_AlcremieStrawberryVanillaCream, 4, 4),
+static const struct SpriteFrameImage sPicTable_AlcremieStrawberry[] = {
+    overworld_ascending_frames(gObjectEventPic_AlcremieStrawberry, 4, 4),
 };
 #if P_GIGANTAMAX_FORMS
 /*static const struct SpriteFrameImage sPicTable_AlcremieGigantamax[] = {
--- a/src/data/pokemon/species_info/gen_8_families.h
+++ b/src/data/pokemon/species_info/gen_8_families.h
@ -4597,12 +4597,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .iconPalIndex = 1,                                                                      \
        FOOTPRINT(Alcremie)                                                                     \
        FOLLOWER(                                                                               \
-            sPicTable_AlcremieStrawberryVanillaCream,                                           \
+            sPicTable_AlcremieStrawberry, /*Alcremie ##sweet*/                                  \
            SIZE_32x32,                                                                         \
            SHADOW_SIZE_M,                                                                      \
            TRACKS_FOOT,                                                                        \
-            gFollowerPalette_AlcremieStrawberryVanillaCream,                                    \
-            gShinyFollowerPalette_AlcremieStrawberryVanillaCream                                \
+            gFollowerPalette_AlcremieStrawberryVanillaCream, /*Alcremie ##sweet##cream*/        \
+            gShinyFollowerPalette_AlcremieStrawberryVanillaCream /*Alcremie ##sweet##cream*/    \
        )                                                                                       \
        .levelUpLearnset = sAlcremieLevelUpLearnset,                                            \
        .teachableLearnset = sAlcremieTeachableLearnset,                                        \
@ -6346,6 +6346,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .iconSprite = gMonIcon_ZamazentaHeroOfManyBattles,
        .iconPalIndex = 2,
        FOOTPRINT(Zamazenta)
+        FOLLOWER(
+            sPicTable_ZamazentaHeroOfManyBattles,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gFollowerPalette_ZamazentaHeroOfManyBattles,
+            gShinyFollowerPalette_ZamazentaHeroOfManyBattles
+        )
        .isLegendary = TRUE,
        .isFrontierBanned = TRUE,
        .levelUpLearnset = sZamazentaLevelUpLearnset,
@ -6471,7 +6479,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        FOOTPRINT(Eternatus)
        FOLLOWER(
            sPicTable_Eternatus,
-            SIZE_64x64,
+            SIZE_32x32,
            SHADOW_SIZE_M,
            TRACKS_FOOT,
            gFollowerPalette_Eternatus,
@ -6654,6 +6662,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .iconSprite = gMonIcon_Urshifu,
        .iconPalIndex = 2,
        FOOTPRINT(Urshifu)
+        FOLLOWER(
+            sPicTable_Urshifu,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gFollowerPalette_Urshifu,
+            gShinyFollowerPalette_Urshifu
+        )
        .isLegendary = TRUE,
        .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset,
        .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset,