PokeCommunity sprites batch (May) (#4714)

rh-hideout · Jun 4, 2024 · daa6b78 · daa6b78
2 parents 0c9fe70 + a5b7574
commit daa6b78
Show file tree

Hide file tree

Showing 23 changed files with 195 additions and 111 deletions.
diff --git a/graphics/pokemon/okidogi/back.png b/graphics/pokemon/okidogi/back.png
diff --git a/graphics/pokemon/okidogi/front.png b/graphics/pokemon/okidogi/front.png
diff --git a/graphics/pokemon/okidogi/normal.pal b/graphics/pokemon/okidogi/normal.pal
@@ -1,18 +1,17 @@
 JASC-PAL
 0100
-15
-152 208 160
-16 16 16
-90 33 73
+14
+153 211 165
+28 28 28
+29 57 21
 45 45 45
+84 117 53
+90 33 73
 78 73 71
-202 103 162
 146 57 119
-26 29 28
 121 167 58
-84 117 53
-184 140 7
 254 208 27
-249 249 249
-29 57 21
+205 80 156
 153 157 166
+16 16 16
+249 249 249
diff --git a/graphics/pokemon/okidogi/shiny.pal b/graphics/pokemon/okidogi/shiny.pal
@@ -1,18 +1,17 @@
 JASC-PAL
 0100
-15
-152 208 160
-16 16 16
+14
+153 211 165
+122 50 46
+29 57 21
+188 99 61
+84 117 53
 90 33 73
-140 49 12
-207 71 17
-202 103 162
+254 153 96
 146 57 119
-26 29 28
 121 167 58
-84 117 53
-184 140 7
 254 208 27
-249 249 249
-29 57 21
+205 80 156
 153 157 166
+16 16 16
+249 249 249
diff --git a/graphics/pokemon/pawmi/back.png b/graphics/pokemon/pawmi/back.png
diff --git a/graphics/pokemon/pawmi/front.png b/graphics/pokemon/pawmi/front.png
diff --git a/graphics/pokemon/pawmi/normal.pal b/graphics/pokemon/pawmi/normal.pal
@@ -1,19 +1,18 @@
 JASC-PAL
 0100
-16
-153 210 164
-150 79 14
-243 156 78
+15
+153 211 165
 96 51 23
+52 52 65
+19 121 123
+150 79 14
 126 114 71
-194 89 3
+211 97 3
+235 120 35
+255 205 32
+189 162 115
+243 156 78
+16 16 16
 189 162 115
 244 226 188
-15 15 15
-235 120 35
-46 116 82
-211 97 3
-52 52 65
 252 252 252
-197 164 98
-255 205 32
diff --git a/graphics/pokemon/pawmi/shiny.pal b/graphics/pokemon/pawmi/shiny.pal
@@ -1,19 +1,18 @@
 JASC-PAL
 0100
-16
-153 210 164
-220 58 50
-255 155 172
-96 51 23
-139 83 58
-194 89 3
-228 167 137
-244 226 188
-15 15 15
-255 119 147
-46 116 82
-237 82 82
+15
+153 211 165
+101 29 39
 52 52 65
-252 252 252
-221 177 74
+19 121 123
+165 46 63
+173 124 103
+214 79 87
+242 112 116
 255 205 32
+197 164 98
+251 142 158
+16 16 16
+222 194 165
+252 235 186
+252 252 252
diff --git a/graphics/pokemon/pawmo/back.png b/graphics/pokemon/pawmo/back.png
diff --git a/graphics/pokemon/pawmo/front.png b/graphics/pokemon/pawmo/front.png
diff --git a/graphics/pokemon/pawmo/normal.pal b/graphics/pokemon/pawmo/normal.pal
@@ -1,18 +1,17 @@
 JASC-PAL
 0100
-15
-152 208 160
-136 64 0
-0 0 0
-240 184 72
-16 104 96
-232 152 0
-0 160 144
-176 112 8
-248 232 184
-216 192 160
-88 64 48
-255 255 255
-240 208 56
-168 64 32
-232 72 56
+14
+153 211 165
+111 75 49
+52 52 65
+19 121 123
+141 100 71
+189 130 64
+213 154 79
+214 177 67
+255 216 80
+255 192 96
+202 180 142
+16 16 16
+255 237 192
+255 250 254
diff --git a/graphics/pokemon/pawmo/shiny.pal b/graphics/pokemon/pawmo/shiny.pal
@@ -1,18 +1,17 @@
 JASC-PAL
 0100
-15
-152 208 160
-136 64 0
-0 0 0
-245 158 128
-16 104 96
-242 112 116
-0 186 182
-214 79 87
-248 232 184
-216 192 160
-88 64 48
-255 255 255
-240 208 56
-168 64 32
-232 72 56
+14
+153 211 165
+132 66 101
+52 52 65
+19 121 123
+173 124 103
+192 105 142
+217 138 162
+214 177 67
+255 216 80
+251 164 179
+222 194 165
+16 16 16
+255 237 192
+255 250 254
diff --git a/graphics/pokemon/terapagos/anim_front.png b/graphics/pokemon/terapagos/anim_front.png
diff --git a/graphics/pokemon/terapagos/back.png b/graphics/pokemon/terapagos/back.png
diff --git a/graphics/pokemon/terapagos/normal.pal b/graphics/pokemon/terapagos/normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+38 26 108
+49 34 133
+103 230 225
+60 76 160
+160 64 109
+228 103 181
+0 0 0
+115 162 235
+52 201 163
+76 244 204
+153 228 201
+230 244 173
+205 251 128
+63 50 194
+255 255 255
diff --git a/graphics/pokemon/terapagos/shiny.pal b/graphics/pokemon/terapagos/shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+37 114 136
+66 151 189
+151 58 210
+63 209 230
+160 64 109
+234 243 49
+0 0 0
+218 32 48
+52 201 163
+76 244 204
+153 228 201
+230 244 173
+205 251 128
+63 50 194
+255 255 255
diff --git a/graphics/pokemon/terapagos/terastal/anim_front.png b/graphics/pokemon/terapagos/terastal/anim_front.png
diff --git a/graphics/pokemon/terapagos/terastal/back.png b/graphics/pokemon/terapagos/terastal/back.png
diff --git a/graphics/pokemon/terapagos/terastal/normal.pal b/graphics/pokemon/terapagos/terastal/normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+90 53 7
+42 121 78
+70 70 70
+215 38 89
+41 45 164
+77 151 158
+78 190 242
+170 172 227
+122 228 243
+147 245 227
+252 252 182
+255 255 255
+52 66 152
+0 200 255
+197 34 91
diff --git a/graphics/pokemon/terapagos/terastal/shiny.pal b/graphics/pokemon/terapagos/terastal/shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+90 53 7
+42 121 78
+70 70 70
+215 38 89
+41 45 164
+77 151 158
+78 190 242
+170 172 227
+122 228 243
+147 245 227
+252 252 182
+255 255 255
+84 215 251
+255 0 0
+244 255 0
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
@@ -13026,19 +13026,19 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar
 #endif //P_FAMILY_IRON_CROWN
 
 #if P_FAMILY_TERAPAGOS
-    // const u32 gMonFrontPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/front.4bpp.lz");
-    // const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/normal.gbapal.lz");
-    // const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/back.4bpp.lz");
-    // const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/shiny.gbapal.lz");
+    const u32 gMonFrontPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/anim_front.4bpp.lz");
+    const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/normal.gbapal.lz");
+    const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/back.4bpp.lz");
+    const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/shiny.gbapal.lz");
     const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/icon.4bpp");
 #if P_FOOTPRINTS
     const u8 gMonFootprint_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 
-    // const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/front.4bpp.lz");
-    // const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz");
-    // const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/back.4bpp.lz");
-    // const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/shiny.gbapal.lz");
+    const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/anim_front.4bpp.lz");
+    const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz");
+    const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/back.4bpp.lz");
+    const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/shiny.gbapal.lz");
     const u8 gMonIcon_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/icon.4bpp");
 #if P_FOOTPRINTS
     const u8 gMonFootprint_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/footprint.1bpp");

diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h
@@ -900,7 +900,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
         .backPic = gMonBackPic_Pawmi,
         .backPicSize = MON_COORDS_SIZE(64, 64),
-        .backPicYOffset = 0,
+        .backPicYOffset = 7,
         //.backAnimId = BACK_ANIM_NONE,
         .palette = gMonPalette_Pawmi,
         .shinyPalette = gMonShinyPalette_Pawmi,
@@ -953,7 +953,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
         .backPic = gMonBackPic_Pawmo,
         .backPicSize = MON_COORDS_SIZE(64, 64),
-        .backPicYOffset = 4,
+        .backPicYOffset = 6,
         //.backAnimId = BACK_ANIM_NONE,
         .palette = gMonPalette_Pawmo,
         .shinyPalette = gMonShinyPalette_Pawmo,
@@ -6129,12 +6129,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .trainerOffset = 0,
         .frontPic = gMonFrontPic_Okidogi,
         .frontPicSize = MON_COORDS_SIZE(64, 64),
-        .frontPicYOffset = 1,
+        .frontPicYOffset = 2,
         .frontAnimFrames = sAnims_Okidogi,
         //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
         .backPic = gMonBackPic_Okidogi,
         .backPicSize = MON_COORDS_SIZE(64, 64),
-        .backPicYOffset = 16,
+        .backPicYOffset = 12,
         //.backAnimId = BACK_ANIM_NONE,
         .palette = gMonPalette_Okidogi,
         .shinyPalette = gMonShinyPalette_Okidogi,
@@ -6576,17 +6576,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .pokemonOffset = 0,
         .trainerScale = 365,
         .trainerOffset = 7,
-        //.frontPic = gMonFrontPic_TerapagosNormal,
-        //.frontPicSize = MON_COORDS_SIZE(64, 64),
+        .frontPic = gMonFrontPic_TerapagosNormal,
+        .frontPicSize = MON_COORDS_SIZE(64, 64),
         .frontPicYOffset = 0,
         .frontAnimFrames = sAnims_TerapagosNormal,
-        //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
-        //.backPic = gMonBackPic_TerapagosNormal,
-        //.backPicSize = MON_COORDS_SIZE(64, 64),
+        .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
+        .enemyMonElevation = 1,
+        .backPic = gMonBackPic_TerapagosNormal,
+        .backPicSize = MON_COORDS_SIZE(64, 64),
         .backPicYOffset = 0,
-        //.backAnimId = BACK_ANIM_NONE,
-        //.palette = gMonPalette_TerapagosNormal,
-        //.shinyPalette = gMonShinyPalette_TerapagosNormal,
+        .backAnimId = BACK_ANIM_NONE,
+        .palette = gMonPalette_TerapagosNormal,
+        .shinyPalette = gMonShinyPalette_TerapagosNormal,
         .iconSprite = gMonIcon_TerapagosNormal,
         .iconPalIndex = 0,
         FOOTPRINT(TerapagosNormal)
@@ -6632,17 +6633,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .pokemonOffset = 0,
         .trainerScale = 365,
         .trainerOffset = 7,
-        //.frontPic = gMonFrontPic_TerapagosTerastal,
-        //.frontPicSize = MON_COORDS_SIZE(64, 64),
-        .frontPicYOffset = 0,
+        .frontPic = gMonFrontPic_TerapagosTerastal,
+        .frontPicSize = MON_COORDS_SIZE(64, 64),
+        .frontPicYOffset = 8,
         .frontAnimFrames = sAnims_TerapagosTerastal,
-        //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
-        //.backPic = gMonBackPic_TerapagosTerastal,
-        //.backPicSize = MON_COORDS_SIZE(64, 64),
+        .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
+        .enemyMonElevation = 1,
+        .backPic = gMonBackPic_TerapagosTerastal,
+        .backPicSize = MON_COORDS_SIZE(64, 64),
         .backPicYOffset = 0,
-        //.backAnimId = BACK_ANIM_NONE,
-        //.palette = gMonPalette_TerapagosTerastal,
-        //.shinyPalette = gMonShinyPalette_TerapagosTerastal,
+        .backAnimId = BACK_ANIM_NONE,
+        .palette = gMonPalette_TerapagosTerastal,
+        .shinyPalette = gMonShinyPalette_TerapagosTerastal,
         .iconSprite = gMonIcon_TerapagosTerastal,
         .iconPalIndex = 0,
         FOOTPRINT(TerapagosTerastal)