From 213c097dc0f48036814670b367c187a15b20ae35 Mon Sep 17 00:00:00 2001
From: Cafei <46283144+Cafeei@users.noreply.github.com>
Date: Wed, 28 Aug 2024 13:47:08 +0400
Subject: [PATCH] Paldean Wooper and Clodsire followers (#5277)

---
 graphics/pokemon/clodsire/overworld.png       | Bin 0 -> 856 bytes
 .../pokemon/clodsire/overworld_normal.pal     |  19 ++++++++++++++++++
 graphics/pokemon/clodsire/overworld_shiny.pal |  19 ++++++++++++++++++
 .../wooper/wooper_paldean/overworld.png       | Bin 0 -> 503 bytes
 .../wooper_paldean/overworld_normal.pal       |  19 ++++++++++++++++++
 .../wooper/wooper_paldean/overworld_shiny.pal |  19 ++++++++++++++++++
 spritesheet_rules.mk                          |   6 ++++++
 src/data/graphics/pokemon.h                   |  12 +++++------
 .../object_event_pic_tables_followers.h       |   4 ++--
 .../pokemon/species_info/gen_2_families.h     |  16 +++++++++++++++
 10 files changed, 106 insertions(+), 8 deletions(-)
 create mode 100644 graphics/pokemon/clodsire/overworld.png
 create mode 100644 graphics/pokemon/clodsire/overworld_normal.pal
 create mode 100644 graphics/pokemon/clodsire/overworld_shiny.pal
 create mode 100644 graphics/pokemon/wooper/wooper_paldean/overworld.png
 create mode 100644 graphics/pokemon/wooper/wooper_paldean/overworld_normal.pal
 create mode 100644 graphics/pokemon/wooper/wooper_paldean/overworld_shiny.pal

diff --git a/graphics/pokemon/clodsire/overworld.png b/graphics/pokemon/clodsire/overworld.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ffdd7a21e7ab9bd0f567c08422fb140b78cb00a
GIT binary patch
literal 856
zcmV-e1E>6nP)<h;3K|Lk000e1NJLTq006)M001Be0{{R3b4G`^00001b5ch_0Itp)
z=>Px#Fi=cXMVQc_Ks+#jY+zteNH8cM5D*Z!prFvu&?y=Vl6!ejL`Y~fIIvh~_>7<c
z000000KWF4%m4ra)=5M`R9J=WSLu@EAPA0EqP+hDFQCZ?qHgU>Pyg7as*eh^eut=i
z9H02aC;q3%7@PF6;LVY9$Qh;xG0pK#3QGYIpvTvYLB0^Y_xN_rDZbXBox%u@R0gvk
zUl-;n!eujfxkDR;kIa)#2@w3VQLrlh!l7@*T45^4DdB5^|GJO>Ge9rKn!Q8cj;b)g
zoB)7}lk}dz&Y>R&QW#_210f)RU@wqx`6mVf*t&|~OB!LNFt1_nnZURL2w+_xjuln_
zb19ktKKXh4D~0P4@G){9YJmwLGjOi<sRURF2!~!kV5Kmp9|S`aBAh0%L!MROA}!Dk
zY5cLq9NxBIr7-<oE&(~vO&}0~U=XNhK<|*8A;va#Om=f@3)TuVzd%FOZDd?S7>*7p
zm+Sk`q)9rIlsaF_D_IDw0yW1{;V%N-Ccp@x9dvk*q#=DshZMXHUvT3-Xch35+4tE}
z;o9NP5N4m}1ns0YH)83K#z($X>G1as2N1U=qkygr#6=UBD$El<_$LH#3#Nl`a#nW^
z$&AEzRe=48WECWV6K7Tm1Bf}GUBvFlGJS9(L%j@wy+zI)ioG}l5j9A@6WA(fI2ye3
z)C!+x2N9sKeosIyis6w;Nx+vu`exuqg3TdKFa{M^6MBKo0*gSWuq1%_64ISap~!q?
zK(698i2@t=iQtz*dJ{@wa?tp!0;+I#GvVNa!u=#jpx_fsw6|PF0!Io=00~b14%`mu
zeNqVw@G!6);Jm|ltb_zwVSFUiL;2`*;>aZ8xJ(eANBkZv1Gu0$G$bPF!b3AW`a()P
z0$T+X;$W5v57^+i{}Hl&V8BR)H?h;|0M0)SSqwzPNEA98W5IZ@=oPjR>;f5J%<wNA
zLNpG4>guPX2U1{>o?VGLh5s#pHt(S~9s+BJB9bRyuJFg9Q0nwMV(k#E5{8z{CfcNb
iCpHePk-Zc63*!&kk0oqc0f!&}0000<MNUMnLSTYP6mc#9

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/clodsire/overworld_normal.pal b/graphics/pokemon/clodsire/overworld_normal.pal
new file mode 100644
index 0000000000..c7d36df32c
--- /dev/null
+++ b/graphics/pokemon/clodsire/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+64 60 48
+128 108 96
+96 80 72
+48 40 32
+16 16 16
+184 160 160
+208 208 208
+40 36 32
+152 120 120
+80 68 72
+104 52 56
+176 88 104
+248 140 160
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/clodsire/overworld_shiny.pal b/graphics/pokemon/clodsire/overworld_shiny.pal
new file mode 100644
index 0000000000..6b37341aaf
--- /dev/null
+++ b/graphics/pokemon/clodsire/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+74 67 90
+127 116 143
+96 87 115
+46 40 44
+16 16 16
+160 158 197
+205 180 170
+40 36 32
+117 117 158
+77 63 72
+104 52 56
+176 88 104
+248 140 160
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/wooper/wooper_paldean/overworld.png b/graphics/pokemon/wooper/wooper_paldean/overworld.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f8857dc4679a3398ae5b38af5a62f62e2503c32
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq006)M001Be0{{R3b4G`^00001b5ch_0Itp)
z=>Px#Fi=cXMVZs3V@Y_)vD;NcLTFM^5D*ZllahjGW}bnw|Ns9kBqOvzLH}xV00000
z000000NO{vy8r+IbxA})R9J=Wmg{c9Fbsto64&7Of8ZUb?N){_L)ErFJ_scAInJ?@
zrdgI!sZ=VJN~Kb%RGK2_ANlq4D>M5szsyOJ;R#=e*HuH<2?=?7=Ivd6aeB>2U^75N
z3<Du=_jcy^`yPknl-^Rz+igz3#{{?U1`-a3Xa4Fh<LYlyvkS;LEHOVc06(w(QocMF
zXiSjs18b`+gBeGQka%WiHX4+1ba)*8hP?tISA&nu-|z|uxfV8tKw}s?B;&fNL8d)S
zU_ApNhru!Xb8kZ|e;J>a2o{l^_P;I{F)F}UKF6Df07V?xyHb>97jWWs1$&vgK8Uc6
z!Gq5=FeV_`$J_Jk=@IbxnnG&y#;f4qeh%u8MtMi^<iq5;zPd!>9^*0J@`Jaa2?<Al
zh-dJNi}^C7uKU|B9u36y@6i%q4<daKf+w)!6SaWIGq{-yZX>$FqT_??J-*C{uD=8Z
tNdtlenj^j~C8Mv7kMC+f2`K%wJ^<Zw5<`XsB{u*7002ovPDHLkV1i9++aLe{

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wooper/wooper_paldean/overworld_normal.pal b/graphics/pokemon/wooper/wooper_paldean/overworld_normal.pal
new file mode 100644
index 0000000000..714f15aa52
--- /dev/null
+++ b/graphics/pokemon/wooper/wooper_paldean/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 211 165
+99 73 120
+201 177 219
+85 67 66
+104 82 81
+16 16 16
+169 147 146
+130 103 102
+158 129 179
+255 255 255
+46 36 35
+180 65 65
+255 106 115
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/wooper/wooper_paldean/overworld_shiny.pal b/graphics/pokemon/wooper/wooper_paldean/overworld_shiny.pal
new file mode 100644
index 0000000000..85ffcdee9f
--- /dev/null
+++ b/graphics/pokemon/wooper/wooper_paldean/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 211 165
+120 80 48
+230 186 149
+102 96 146
+140 133 186
+16 16 16
+204 202 219
+171 167 198
+200 144 97
+255 255 255
+35 36 46
+180 65 65
+255 106 115
+0 0 0
+0 0 0
+0 0 0
diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk
index c10c9081f4..649995a5cb 100644
--- a/spritesheet_rules.mk
+++ b/spritesheet_rules.mk
@@ -3996,6 +3996,12 @@ $(POKEMONGFXDIR)/exeggutor/alolan/overworld.4bpp: %.4bpp: %.png
 $(POKEMONGFXDIR)/marowak/alolan/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
+$(POKEMONGFXDIR)/wooper/wooper_paldean/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/clodsire/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
 $(MISCGFXDIR)/emotes.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index e75425823a..6387c3168f 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -5193,10 +5193,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/shiny.gbapal.lz");
     const u8 gMonIcon_WooperPaldean[] = INCBIN_U8("graphics/pokemon/wooper/wooper_paldean/icon.4bpp");
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_WooperPaldean[] = INCBIN_COMP("graphics/pokemon/wooper/wooper_paldean/overworld.4bpp");
+    const u32 gObjectEventPic_WooperPaldean[] = INCBIN_COMP("graphics/pokemon/wooper/wooper_paldean/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -5209,10 +5209,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Clodsire[] = INCBIN_COMP("graphics/pokemon/clodsire/overworld.4bpp");
+    const u32 gObjectEventPic_Clodsire[] = INCBIN_COMP("graphics/pokemon/clodsire/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_PALDEAN_FORMS
diff --git a/src/data/object_events/object_event_pic_tables_followers.h b/src/data/object_events/object_event_pic_tables_followers.h
index b47faf52f1..b71dee44ef 100644
--- a/src/data/object_events/object_event_pic_tables_followers.h
+++ b/src/data/object_events/object_event_pic_tables_followers.h
@@ -1426,12 +1426,12 @@ static const struct SpriteFrameImage sPicTable_Quagsire[] = {
     overworld_ascending_frames(gObjectEventPic_Quagsire, 4, 4),
 };
 #if P_PALDEAN_FORMS
-/*static const struct SpriteFrameImage sPicTable_WooperPaldean[] = {
+static const struct SpriteFrameImage sPicTable_WooperPaldean[] = {
     overworld_ascending_frames(gObjectEventPic_WooperPaldean, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Clodsire[] = {
     overworld_ascending_frames(gObjectEventPic_Clodsire, 4, 4),
-};*/
+};
 #endif //P_PALDEAN_FORMS
 #endif //P_FAMILY_WOOPER
 
diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h
index 1bfbb41bec..d566975ab2 100644
--- a/src/data/pokemon/species_info/gen_2_families.h
+++ b/src/data/pokemon/species_info/gen_2_families.h
@@ -3005,6 +3005,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
         .iconSprite = gMonIcon_WooperPaldean,
         .iconPalIndex = 2,
         FOOTPRINT(Wooper)
+        OVERWORLD(
+            sPicTable_WooperPaldean,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_WooperPaldean,
+            gShinyOverworldPalette_WooperPaldean
+        )
         .isPaldeanForm = TRUE,
         .levelUpLearnset = sWooperPaldeanLevelUpLearnset,
         .teachableLearnset = sWooperPaldeanTeachableLearnset,
@@ -3061,6 +3069,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
         .iconSprite = gMonIcon_Clodsire,
         .iconPalIndex = 0,
         FOOTPRINT(Clodsire)
+        OVERWORLD(
+            sPicTable_Clodsire,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Clodsire,
+            gShinyOverworldPalette_Clodsire
+        )
         .levelUpLearnset = sClodsireLevelUpLearnset,
         .teachableLearnset = sClodsireTeachableLearnset,
     },