Add support for overworld sprite gender differences + add all the spr…

…ites (#5394)
rh-hideout · Oct 4, 2024 · 19009c6 · 19009c6
1 parent 077bbd3
commit 19009c6
Show file tree

Hide file tree

Showing 155 changed files with 1,706 additions and 62 deletions.
diff --git a/graphics/pokemon/abomasnow/overworldf.png b/graphics/pokemon/abomasnow/overworldf.png
diff --git a/graphics/pokemon/aipom/overworldf.png b/graphics/pokemon/aipom/overworldf.png
diff --git a/graphics/pokemon/alakazam/overworldf.png b/graphics/pokemon/alakazam/overworldf.png
diff --git a/graphics/pokemon/ambipom/overworld.png b/graphics/pokemon/ambipom/overworld.png
diff --git a/graphics/pokemon/ambipom/overworldf.png b/graphics/pokemon/ambipom/overworldf.png
diff --git a/graphics/pokemon/beautifly/overworld.png b/graphics/pokemon/beautifly/overworld.png
diff --git a/graphics/pokemon/beautifly/overworldf.png b/graphics/pokemon/beautifly/overworldf.png
diff --git a/graphics/pokemon/bibarel/overworld.png b/graphics/pokemon/bibarel/overworld.png
diff --git a/graphics/pokemon/bibarel/overworldf.png b/graphics/pokemon/bibarel/overworldf.png
diff --git a/graphics/pokemon/bidoof/overworld.png b/graphics/pokemon/bidoof/overworld.png
diff --git a/graphics/pokemon/bidoof/overworldf.png b/graphics/pokemon/bidoof/overworldf.png
diff --git a/graphics/pokemon/blaziken/overworldf.png b/graphics/pokemon/blaziken/overworldf.png
diff --git a/graphics/pokemon/buizel/overworldf.png b/graphics/pokemon/buizel/overworldf.png
diff --git a/graphics/pokemon/butterfree/overworld.png b/graphics/pokemon/butterfree/overworld.png
diff --git a/graphics/pokemon/butterfree/overworld_normal.pal b/graphics/pokemon/butterfree/overworld_normal.pal
@@ -15,5 +15,5 @@ JASC-PAL
 104 200 248
 80 144 224
 48 64 144
-0 0 0
+73 73 73
 0 0 0
diff --git a/graphics/pokemon/butterfree/overworld_shiny.pal b/graphics/pokemon/butterfree/overworld_shiny.pal
@@ -15,5 +15,5 @@ JASC-PAL
 248 112 136
 176 72 96
 112 40 56
-0 0 0
+73 73 73
 0 0 0
diff --git a/graphics/pokemon/butterfree/overworldf.png b/graphics/pokemon/butterfree/overworldf.png
diff --git a/graphics/pokemon/cacturne/overworldf.png b/graphics/pokemon/cacturne/overworldf.png
diff --git a/graphics/pokemon/camerupt/overworldf.png b/graphics/pokemon/camerupt/overworldf.png
diff --git a/graphics/pokemon/combee/followerf.png b/graphics/pokemon/combee/followerf.png
diff --git a/graphics/pokemon/combee/overworld.png b/graphics/pokemon/combee/overworld.png
diff --git a/graphics/pokemon/combee/overworld_normal.pal b/graphics/pokemon/combee/overworld_normal.pal
@@ -14,6 +14,6 @@ JASC-PAL
 200 104 40
 152 184 232
 248 216 120
-0 0 0
+160 32 56
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/combee/overworld_shiny.pal b/graphics/pokemon/combee/overworld_shiny.pal
@@ -14,6 +14,6 @@ JASC-PAL
 200 104 40
 152 184 232
 248 176 128
-0 0 0
+160 32 56
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/combee/overworldf.png b/graphics/pokemon/combee/overworldf.png
diff --git a/graphics/pokemon/combusken/overworld.png b/graphics/pokemon/combusken/overworld.png
diff --git a/graphics/pokemon/combusken/overworldf.png b/graphics/pokemon/combusken/overworldf.png
diff --git a/graphics/pokemon/croagunk/overworldf.png b/graphics/pokemon/croagunk/overworldf.png
diff --git a/graphics/pokemon/dodrio/overworldf.png b/graphics/pokemon/dodrio/overworldf.png
diff --git a/graphics/pokemon/doduo/overworldf.png b/graphics/pokemon/doduo/overworldf.png
diff --git a/graphics/pokemon/donphan/overworldf.png b/graphics/pokemon/donphan/overworldf.png
diff --git a/graphics/pokemon/dustox/overworldf.png b/graphics/pokemon/dustox/overworldf.png
diff --git a/graphics/pokemon/eevee/overworldf.png b/graphics/pokemon/eevee/overworldf.png
diff --git a/graphics/pokemon/finneon/overworldf.png b/graphics/pokemon/finneon/overworldf.png
diff --git a/graphics/pokemon/floatzel/overworldf.png b/graphics/pokemon/floatzel/overworldf.png
diff --git a/graphics/pokemon/frillish/overworld_normalf.pal b/graphics/pokemon/frillish/overworld_normalf.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+184 128 160
+140 83 98
+208 176 184
+248 216 224
+248 176 208
+120 56 80
+11 11 11
+229 229 247
+168 48 64
+88 160 192
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/frillish/overworld_shinyf.pal b/graphics/pokemon/frillish/overworld_shinyf.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+192 120 120
+120 56 80
+208 176 232
+232 224 248
+248 152 152
+120 56 80
+11 11 11
+248 248 248
+128 24 136
+72 152 136
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/frillish/followerf.png → graphics/pokemon/frillish/overworldf.png b/graphics/pokemon/frillish/followerf.png → graphics/pokemon/frillish/overworldf.png
diff --git a/graphics/pokemon/gabite/overworldf.png b/graphics/pokemon/gabite/overworldf.png
diff --git a/graphics/pokemon/garchomp/overworldf.png b/graphics/pokemon/garchomp/overworldf.png
diff --git a/graphics/pokemon/gible/overworldf.png b/graphics/pokemon/gible/overworldf.png
diff --git a/graphics/pokemon/girafarig/overworldf.png b/graphics/pokemon/girafarig/overworldf.png
diff --git a/graphics/pokemon/gligar/overworldf.png b/graphics/pokemon/gligar/overworldf.png
diff --git a/graphics/pokemon/gloom/overworldf.png b/graphics/pokemon/gloom/overworldf.png
diff --git a/graphics/pokemon/golbat/overworld.png b/graphics/pokemon/golbat/overworld.png
diff --git a/graphics/pokemon/golbat/overworldf.png b/graphics/pokemon/golbat/overworldf.png
diff --git a/graphics/pokemon/goldeen/overworldf.png b/graphics/pokemon/goldeen/overworldf.png
diff --git a/graphics/pokemon/gulpin/overworldf.png b/graphics/pokemon/gulpin/overworldf.png
diff --git a/graphics/pokemon/gyarados/overworld.png b/graphics/pokemon/gyarados/overworld.png
diff --git a/graphics/pokemon/gyarados/overworldf.png b/graphics/pokemon/gyarados/overworldf.png
diff --git a/graphics/pokemon/heracross/overworldf.png b/graphics/pokemon/heracross/overworldf.png
diff --git a/graphics/pokemon/hippopotas/followerf.png b/graphics/pokemon/hippopotas/followerf.png
diff --git a/graphics/pokemon/hippopotas/overworldf.png b/graphics/pokemon/hippopotas/overworldf.png
diff --git a/graphics/pokemon/hippowdon/followerf.png b/graphics/pokemon/hippowdon/followerf.png
diff --git a/graphics/pokemon/hippowdon/overworld_normalf.pal b/graphics/pokemon/hippowdon/overworld_normalf.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+0 0 0
+96 96 96
+48 48 48
+72 72 72
+88 88 104
+136 136 144
+192 56 80
+168 168 168
+200 200 208
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/hippowdon/overworld_shinyf.pal b/graphics/pokemon/hippowdon/overworld_shinyf.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+0 0 0
+136 136 104
+48 48 48
+96 96 72
+160 160 128
+184 192 152
+192 56 80
+152 208 160
+200 200 208
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/houndoom/overworldf.png b/graphics/pokemon/houndoom/overworldf.png
diff --git a/graphics/pokemon/hypno/overworldf.png b/graphics/pokemon/hypno/overworldf.png
diff --git a/graphics/pokemon/jellicent/followerf.png b/graphics/pokemon/jellicent/followerf.png
diff --git a/graphics/pokemon/jellicent/overworld_normalf.pal b/graphics/pokemon/jellicent/overworld_normalf.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+7 7 7
+247 212 238
+109 46 69
+203 117 168
+247 151 194
+185 151 177
+185 151 177
+247 247 247
+214 53 26
+45 20 29
+32 69 142
+0 0 0
+247 212 238
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/jellicent/overworld_shinyf.pal b/graphics/pokemon/jellicent/overworld_shinyf.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+7 7 7
+240 216 248
+88 64 112
+160 120 224
+208 176 248
+168 152 184
+185 151 177
+247 247 247
+200 32 192
+45 20 29
+32 69 142
+0 0 0
+247 212 238
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/jellicent/overworldf.png b/graphics/pokemon/jellicent/overworldf.png
diff --git a/graphics/pokemon/kadabra/overworldf.png b/graphics/pokemon/kadabra/overworldf.png
diff --git a/graphics/pokemon/kricketot/overworldf.png b/graphics/pokemon/kricketot/overworldf.png
diff --git a/graphics/pokemon/kricketune/overworldf.png b/graphics/pokemon/kricketune/overworldf.png
diff --git a/graphics/pokemon/ledian/overworldf.png b/graphics/pokemon/ledian/overworldf.png
diff --git a/graphics/pokemon/ledyba/overworldf.png b/graphics/pokemon/ledyba/overworldf.png
diff --git a/graphics/pokemon/ludicolo/overworld.png b/graphics/pokemon/ludicolo/overworld.png
diff --git a/graphics/pokemon/ludicolo/overworldf.png b/graphics/pokemon/ludicolo/overworldf.png
diff --git a/graphics/pokemon/lumineon/overworldf.png b/graphics/pokemon/lumineon/overworldf.png
diff --git a/graphics/pokemon/luxio/overworldf.png b/graphics/pokemon/luxio/overworldf.png
diff --git a/graphics/pokemon/luxray/overworldf.png b/graphics/pokemon/luxray/overworldf.png
diff --git a/graphics/pokemon/magikarp/overworld.png b/graphics/pokemon/magikarp/overworld.png
diff --git a/graphics/pokemon/magikarp/overworldf.png b/graphics/pokemon/magikarp/overworldf.png
diff --git a/graphics/pokemon/mamoswine/overworldf.png b/graphics/pokemon/mamoswine/overworldf.png
diff --git a/graphics/pokemon/medicham/overworldf.png b/graphics/pokemon/medicham/overworldf.png
diff --git a/graphics/pokemon/meditite/overworld.png b/graphics/pokemon/meditite/overworld.png
diff --git a/graphics/pokemon/meditite/overworldf.png b/graphics/pokemon/meditite/overworldf.png
diff --git a/graphics/pokemon/meganium/overworldf.png b/graphics/pokemon/meganium/overworldf.png
diff --git a/graphics/pokemon/milotic/overworldf.png b/graphics/pokemon/milotic/overworldf.png
diff --git a/graphics/pokemon/murkrow/overworld.png b/graphics/pokemon/murkrow/overworld.png
diff --git a/graphics/pokemon/murkrow/overworldf.png b/graphics/pokemon/murkrow/overworldf.png
diff --git a/graphics/pokemon/numel/overworldf.png b/graphics/pokemon/numel/overworldf.png
diff --git a/graphics/pokemon/nuzleaf/overworldf.png b/graphics/pokemon/nuzleaf/overworldf.png
diff --git a/graphics/pokemon/octillery/overworldf.png b/graphics/pokemon/octillery/overworldf.png
diff --git a/graphics/pokemon/pachirisu/overworldf.png b/graphics/pokemon/pachirisu/overworldf.png
diff --git a/graphics/pokemon/pikachu/overworldf.png b/graphics/pokemon/pikachu/overworldf.png
diff --git a/graphics/pokemon/piloswine/overworldf.png b/graphics/pokemon/piloswine/overworldf.png
diff --git a/graphics/pokemon/politoed/overworldf.png b/graphics/pokemon/politoed/overworldf.png
diff --git a/graphics/pokemon/pyroar/followerf.png b/graphics/pokemon/pyroar/followerf.png
diff --git a/graphics/pokemon/pyroar/overworldf.png b/graphics/pokemon/pyroar/overworldf.png
diff --git a/graphics/pokemon/quagsire/overworld.png b/graphics/pokemon/quagsire/overworld.png
diff --git a/graphics/pokemon/quagsire/overworldf.png b/graphics/pokemon/quagsire/overworldf.png
diff --git a/graphics/pokemon/raichu/overworldf.png b/graphics/pokemon/raichu/overworldf.png
diff --git a/graphics/pokemon/raticate/overworldf.png b/graphics/pokemon/raticate/overworldf.png
diff --git a/graphics/pokemon/rattata/overworldf.png b/graphics/pokemon/rattata/overworldf.png
diff --git a/graphics/pokemon/relicanth/overworldf.png b/graphics/pokemon/relicanth/overworldf.png
diff --git a/graphics/pokemon/rhydon/overworldf.png b/graphics/pokemon/rhydon/overworldf.png
diff --git a/graphics/pokemon/rhyhorn/overworldf.png b/graphics/pokemon/rhyhorn/overworldf.png
diff --git a/graphics/pokemon/rhyperior/overworldf.png b/graphics/pokemon/rhyperior/overworldf.png
diff --git a/graphics/pokemon/roselia/overworld.png b/graphics/pokemon/roselia/overworld.png
diff --git a/graphics/pokemon/roselia/overworldf.png b/graphics/pokemon/roselia/overworldf.png
diff --git a/graphics/pokemon/roserade/overworldf.png b/graphics/pokemon/roserade/overworldf.png
diff --git a/graphics/pokemon/scizor/overworldf.png b/graphics/pokemon/scizor/overworldf.png
diff --git a/graphics/pokemon/scyther/overworldf.png b/graphics/pokemon/scyther/overworldf.png
diff --git a/graphics/pokemon/seaking/overworldf.png b/graphics/pokemon/seaking/overworldf.png
diff --git a/graphics/pokemon/shiftry/overworld.png b/graphics/pokemon/shiftry/overworld.png
diff --git a/graphics/pokemon/shiftry/overworldf.png b/graphics/pokemon/shiftry/overworldf.png
diff --git a/graphics/pokemon/shinx/overworldf.png b/graphics/pokemon/shinx/overworldf.png
diff --git a/graphics/pokemon/sneasel/hisuian/overworldf.png b/graphics/pokemon/sneasel/hisuian/overworldf.png
diff --git a/graphics/pokemon/sneasel/overworldf.png b/graphics/pokemon/sneasel/overworldf.png
diff --git a/graphics/pokemon/snover/overworldf.png b/graphics/pokemon/snover/overworldf.png
diff --git a/graphics/pokemon/staraptor/overworldf.png b/graphics/pokemon/staraptor/overworldf.png
diff --git a/graphics/pokemon/staravia/overworldf.png b/graphics/pokemon/staravia/overworldf.png
diff --git a/graphics/pokemon/starly/overworldf.png b/graphics/pokemon/starly/overworldf.png
diff --git a/graphics/pokemon/steelix/overworldf.png b/graphics/pokemon/steelix/overworldf.png
diff --git a/graphics/pokemon/sudowoodo/overworldf.png b/graphics/pokemon/sudowoodo/overworldf.png
diff --git a/graphics/pokemon/swalot/overworld.png b/graphics/pokemon/swalot/overworld.png
diff --git a/graphics/pokemon/swalot/overworldf.png b/graphics/pokemon/swalot/overworldf.png
diff --git a/graphics/pokemon/tangrowth/overworldf.png b/graphics/pokemon/tangrowth/overworldf.png
diff --git a/graphics/pokemon/torchic/overworld.png b/graphics/pokemon/torchic/overworld.png
diff --git a/graphics/pokemon/torchic/overworld_normal.pal b/graphics/pokemon/torchic/overworld_normal.pal
@@ -11,7 +11,7 @@ JASC-PAL
 208 96 0
 248 208 96
 232 232 248
-0 0 0
+99 99 99
 0 0 0
 0 0 0
 0 0 0

diff --git a/graphics/pokemon/torchic/overworld_shiny.pal b/graphics/pokemon/torchic/overworld_shiny.pal
@@ -11,7 +11,7 @@ JASC-PAL
 200 168 48
 248 208 152
 232 232 248
-0 0 0
+99 99 99
 0 0 0
 0 0 0
 0 0 0

diff --git a/graphics/pokemon/torchic/overworldf.png b/graphics/pokemon/torchic/overworldf.png
diff --git a/graphics/pokemon/toxicroak/overworldf.png b/graphics/pokemon/toxicroak/overworldf.png
diff --git a/graphics/pokemon/unfezant/overworld_normalf.pal b/graphics/pokemon/unfezant/overworld_normalf.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 210 164
+36 36 36
+66 66 66
+0 0 0
+141 141 141
+207 207 207
+159 124 25
+246 187 37
+106 106 106
+51 37 25
+246 187 31
+226 226 246
+141 98 44
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/unfezant/overworld_shinyf.pal b/graphics/pokemon/unfezant/overworld_shinyf.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 210 164
+32 32 24
+88 64 40
+0 0 0
+168 160 128
+200 200 176
+160 120 64
+246 187 37
+106 106 106
+51 37 25
+248 184 0
+226 226 246
+248 152 32
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/unfezant/followerf.png → graphics/pokemon/unfezant/overworldf.png b/graphics/pokemon/unfezant/followerf.png → graphics/pokemon/unfezant/overworldf.png
diff --git a/graphics/pokemon/unfezant_f/overworld.png b/graphics/pokemon/unfezant_f/overworld.png
diff --git a/graphics/pokemon/ursaring/overworldf.png b/graphics/pokemon/ursaring/overworldf.png
diff --git a/graphics/pokemon/venusaur/overworldf.png b/graphics/pokemon/venusaur/overworldf.png
diff --git a/graphics/pokemon/vileplume/overworldf.png b/graphics/pokemon/vileplume/overworldf.png
diff --git a/graphics/pokemon/weavile/overworldf.png b/graphics/pokemon/weavile/overworldf.png
diff --git a/graphics/pokemon/wobbuffet/overworld.png b/graphics/pokemon/wobbuffet/overworld.png
diff --git a/graphics/pokemon/wobbuffet/overworld_normal.pal b/graphics/pokemon/wobbuffet/overworld_normal.pal
@@ -10,8 +10,8 @@ JASC-PAL
 32 48 64
 56 80 112
 168 184 208
-0 0 0
-0 0 0
+208 56 24
+136 24 0
 0 0 0
 0 0 0
 0 0 0

diff --git a/graphics/pokemon/wobbuffet/overworld_shiny.pal b/graphics/pokemon/wobbuffet/overworld_shiny.pal
@@ -10,8 +10,8 @@ JASC-PAL
 32 48 64
 56 80 112
 168 184 208
-0 0 0
-0 0 0
+208 56 24
+136 24 0
 0 0 0
 0 0 0
 0 0 0

diff --git a/graphics/pokemon/wobbuffet/overworldf.png b/graphics/pokemon/wobbuffet/overworldf.png
diff --git a/graphics/pokemon/wooper/overworldf.png b/graphics/pokemon/wooper/overworldf.png
diff --git a/graphics/pokemon/xatu/overworld.png b/graphics/pokemon/xatu/overworld.png
diff --git a/graphics/pokemon/xatu/overworldf.png b/graphics/pokemon/xatu/overworldf.png
diff --git a/graphics/pokemon/zubat/overworld.png b/graphics/pokemon/zubat/overworld.png
diff --git a/graphics/pokemon/zubat/overworldf.png b/graphics/pokemon/zubat/overworldf.png
diff --git a/include/pokemon.h b/include/pokemon.h
@@ -457,9 +457,12 @@ struct SpeciesInfo /*0xC4*/
  /* 0x94 */ const struct FormChange *formChangeTable;
 #if OW_POKEMON_OBJECT_EVENTS
  /* 0x98 */ struct ObjectEventGraphicsInfo overworldData;
+            struct ObjectEventGraphicsInfo overworldDataFemale;
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
  /* 0xBC */ const void* overworldPalette;
+            const void* overworldPaletteFemale;
  /* 0xC0 */ const void* overworldShinyPalette;
+            const void* overworldShinyPaletteFemale;
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,5 +15,5 @@ JASC-PAL @@
 200 248
 144 224
 64 144
-0 0
+73 73
 0 0