diff --git a/gflib/sprite.c b/gflib/sprite.c index c489eb6a4..80fba81fe 100644 --- a/gflib/sprite.c +++ b/gflib/sprite.c @@ -1600,7 +1600,7 @@ u8 LoadSpritePalette(const struct SpritePalette *palette) else { sSpritePaletteTags[index] = palette->tag; - DoLoadSpritePalette(palette->data, index * 16); + DoLoadSpritePalette(palette->data, PLTT_ID(index)); return index; } } diff --git a/graphics/battle_transitions/frontier_logo_center.bin b/graphics/battle_transitions/frontier_logo_center.bin index 7b9d2af28..524791346 100644 Binary files a/graphics/battle_transitions/frontier_logo_center.bin and b/graphics/battle_transitions/frontier_logo_center.bin differ diff --git a/graphics/pokeblock/use_screen/graph_data.bin b/graphics/pokeblock/use_screen/graph_data.bin index 5f8f364fc..75581f46e 100644 Binary files a/graphics/pokeblock/use_screen/graph_data.bin and b/graphics/pokeblock/use_screen/graph_data.bin differ diff --git a/graphics/pokeblock/use_screen/mon_frame.bin b/graphics/pokeblock/use_screen/mon_frame.bin index 4e7c2d4ad..130dcff29 100644 Binary files a/graphics/pokeblock/use_screen/mon_frame.bin and b/graphics/pokeblock/use_screen/mon_frame.bin differ diff --git a/graphics/pokemon/abomasnow/footprint.png b/graphics/pokemon/abomasnow/footprint.png index 51788b73a..346ca954d 100644 Binary files a/graphics/pokemon/abomasnow/footprint.png and b/graphics/pokemon/abomasnow/footprint.png differ diff --git a/graphics/pokemon/abra/footprint.png b/graphics/pokemon/abra/footprint.png index 42b5e416f..073c78719 100644 Binary files a/graphics/pokemon/abra/footprint.png and b/graphics/pokemon/abra/footprint.png differ diff --git a/graphics/pokemon/absol/footprint.png b/graphics/pokemon/absol/footprint.png index da4076f78..f6280e1be 100644 Binary files a/graphics/pokemon/absol/footprint.png and b/graphics/pokemon/absol/footprint.png differ diff --git a/graphics/pokemon/accelgor/footprint.png b/graphics/pokemon/accelgor/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/accelgor/footprint.png and b/graphics/pokemon/accelgor/footprint.png differ diff --git a/graphics/pokemon/aegislash/footprint.png b/graphics/pokemon/aegislash/footprint.png index 90850b474..2449369fd 100644 Binary files a/graphics/pokemon/aegislash/footprint.png and b/graphics/pokemon/aegislash/footprint.png differ diff --git a/graphics/pokemon/aerodactyl/footprint.png b/graphics/pokemon/aerodactyl/footprint.png index 7c5d3e6c1..b127884a5 100644 Binary files a/graphics/pokemon/aerodactyl/footprint.png and b/graphics/pokemon/aerodactyl/footprint.png differ diff --git a/graphics/pokemon/aggron/footprint.png b/graphics/pokemon/aggron/footprint.png index 3ba6d480b..7c9d7177c 100644 Binary files a/graphics/pokemon/aggron/footprint.png and b/graphics/pokemon/aggron/footprint.png differ diff --git a/graphics/pokemon/aipom/footprint.png b/graphics/pokemon/aipom/footprint.png index 67f7f1188..41d8a4a7c 100644 Binary files a/graphics/pokemon/aipom/footprint.png and b/graphics/pokemon/aipom/footprint.png differ diff --git a/graphics/pokemon/alakazam/footprint.png b/graphics/pokemon/alakazam/footprint.png index e3c3795cf..c6d8f6ebe 100644 Binary files a/graphics/pokemon/alakazam/footprint.png and b/graphics/pokemon/alakazam/footprint.png differ diff --git a/graphics/pokemon/alcremie/footprint.png b/graphics/pokemon/alcremie/footprint.png index aeea2e966..2449369fd 100644 Binary files a/graphics/pokemon/alcremie/footprint.png and b/graphics/pokemon/alcremie/footprint.png differ diff --git a/graphics/pokemon/alomomola/footprint.png b/graphics/pokemon/alomomola/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/alomomola/footprint.png and b/graphics/pokemon/alomomola/footprint.png differ diff --git a/graphics/pokemon/altaria/footprint.png b/graphics/pokemon/altaria/footprint.png index 6c65deae5..3310f5d0d 100644 Binary files a/graphics/pokemon/altaria/footprint.png and b/graphics/pokemon/altaria/footprint.png differ diff --git a/graphics/pokemon/amaura/footprint.png b/graphics/pokemon/amaura/footprint.png index 59e6de954..169bb4cf5 100644 Binary files a/graphics/pokemon/amaura/footprint.png and b/graphics/pokemon/amaura/footprint.png differ diff --git a/graphics/pokemon/ambipom/footprint.png b/graphics/pokemon/ambipom/footprint.png index cb1be3727..0e7f7f638 100644 Binary files a/graphics/pokemon/ambipom/footprint.png and b/graphics/pokemon/ambipom/footprint.png differ diff --git a/graphics/pokemon/amoonguss/footprint.png b/graphics/pokemon/amoonguss/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/amoonguss/footprint.png and b/graphics/pokemon/amoonguss/footprint.png differ diff --git a/graphics/pokemon/ampharos/footprint.png b/graphics/pokemon/ampharos/footprint.png index bfc2f8034..6f0cc20f0 100644 Binary files a/graphics/pokemon/ampharos/footprint.png and b/graphics/pokemon/ampharos/footprint.png differ diff --git a/graphics/pokemon/anorith/footprint.png b/graphics/pokemon/anorith/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/anorith/footprint.png and b/graphics/pokemon/anorith/footprint.png differ diff --git a/graphics/pokemon/appletun/footprint.png b/graphics/pokemon/appletun/footprint.png index f39865658..ca1472dc8 100644 Binary files a/graphics/pokemon/appletun/footprint.png and b/graphics/pokemon/appletun/footprint.png differ diff --git a/graphics/pokemon/applin/footprint.png b/graphics/pokemon/applin/footprint.png index 915b2fc2a..2449369fd 100644 Binary files a/graphics/pokemon/applin/footprint.png and b/graphics/pokemon/applin/footprint.png differ diff --git a/graphics/pokemon/araquanid/footprint.png b/graphics/pokemon/araquanid/footprint.png index 4740af427..2a1c1f3dd 100644 Binary files a/graphics/pokemon/araquanid/footprint.png and b/graphics/pokemon/araquanid/footprint.png differ diff --git a/graphics/pokemon/arbok/footprint.png b/graphics/pokemon/arbok/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/arbok/footprint.png and b/graphics/pokemon/arbok/footprint.png differ diff --git a/graphics/pokemon/arcanine/footprint.png b/graphics/pokemon/arcanine/footprint.png index 96b7f93ae..994cefce6 100644 Binary files a/graphics/pokemon/arcanine/footprint.png and b/graphics/pokemon/arcanine/footprint.png differ diff --git a/graphics/pokemon/arceus/footprint.png b/graphics/pokemon/arceus/footprint.png index b06a466c0..b148dc11d 100644 Binary files a/graphics/pokemon/arceus/footprint.png and b/graphics/pokemon/arceus/footprint.png differ diff --git a/graphics/pokemon/archen/footprint.png b/graphics/pokemon/archen/footprint.png index 6ad18c33c..fd4dff8d6 100644 Binary files a/graphics/pokemon/archen/footprint.png and b/graphics/pokemon/archen/footprint.png differ diff --git a/graphics/pokemon/archeops/footprint.png b/graphics/pokemon/archeops/footprint.png index 68e20f253..8edd0d6f9 100644 Binary files a/graphics/pokemon/archeops/footprint.png and b/graphics/pokemon/archeops/footprint.png differ diff --git a/graphics/pokemon/arctovish/footprint.png b/graphics/pokemon/arctovish/footprint.png index 0ba63e723..40f947b46 100644 Binary files a/graphics/pokemon/arctovish/footprint.png and b/graphics/pokemon/arctovish/footprint.png differ diff --git a/graphics/pokemon/arctozolt/footprint.png b/graphics/pokemon/arctozolt/footprint.png index 2ed399586..40f947b46 100644 Binary files a/graphics/pokemon/arctozolt/footprint.png and b/graphics/pokemon/arctozolt/footprint.png differ diff --git a/graphics/pokemon/ariados/footprint.png b/graphics/pokemon/ariados/footprint.png index cee3b1ba5..e766c18df 100644 Binary files a/graphics/pokemon/ariados/footprint.png and b/graphics/pokemon/ariados/footprint.png differ diff --git a/graphics/pokemon/armaldo/footprint.png b/graphics/pokemon/armaldo/footprint.png index d12d2e42c..b6c085f3d 100644 Binary files a/graphics/pokemon/armaldo/footprint.png and b/graphics/pokemon/armaldo/footprint.png differ diff --git a/graphics/pokemon/aromatisse/footprint.png b/graphics/pokemon/aromatisse/footprint.png index b4df4e542..2a1c1f3dd 100644 Binary files a/graphics/pokemon/aromatisse/footprint.png and b/graphics/pokemon/aromatisse/footprint.png differ diff --git a/graphics/pokemon/aron/footprint.png b/graphics/pokemon/aron/footprint.png index fe53cb5eb..6a87f3c11 100644 Binary files a/graphics/pokemon/aron/footprint.png and b/graphics/pokemon/aron/footprint.png differ diff --git a/graphics/pokemon/arrokuda/footprint.png b/graphics/pokemon/arrokuda/footprint.png index 62b788fdd..2449369fd 100644 Binary files a/graphics/pokemon/arrokuda/footprint.png and b/graphics/pokemon/arrokuda/footprint.png differ diff --git a/graphics/pokemon/articuno/footprint.png b/graphics/pokemon/articuno/footprint.png index e6e4fa9ef..b364b5211 100644 Binary files a/graphics/pokemon/articuno/footprint.png and b/graphics/pokemon/articuno/footprint.png differ diff --git a/graphics/pokemon/audino/footprint.png b/graphics/pokemon/audino/footprint.png index 92f58a91e..ad192e531 100644 Binary files a/graphics/pokemon/audino/footprint.png and b/graphics/pokemon/audino/footprint.png differ diff --git a/graphics/pokemon/aurorus/footprint.png b/graphics/pokemon/aurorus/footprint.png index bb11fc27d..8448898d1 100644 Binary files a/graphics/pokemon/aurorus/footprint.png and b/graphics/pokemon/aurorus/footprint.png differ diff --git a/graphics/pokemon/avalugg/footprint.png b/graphics/pokemon/avalugg/footprint.png index bbed0cff2..6d2f7ebce 100644 Binary files a/graphics/pokemon/avalugg/footprint.png and b/graphics/pokemon/avalugg/footprint.png differ diff --git a/graphics/pokemon/axew/footprint.png b/graphics/pokemon/axew/footprint.png index 42f044823..47c6c4c73 100644 Binary files a/graphics/pokemon/axew/footprint.png and b/graphics/pokemon/axew/footprint.png differ diff --git a/graphics/pokemon/azelf/footprint.png b/graphics/pokemon/azelf/footprint.png index b99863315..f1b5a7a09 100644 Binary files a/graphics/pokemon/azelf/footprint.png and b/graphics/pokemon/azelf/footprint.png differ diff --git a/graphics/pokemon/azumarill/footprint.png b/graphics/pokemon/azumarill/footprint.png index 904bf941c..8c47c8430 100644 Binary files a/graphics/pokemon/azumarill/footprint.png and b/graphics/pokemon/azumarill/footprint.png differ diff --git a/graphics/pokemon/azurill/footprint.png b/graphics/pokemon/azurill/footprint.png index 60db8e03b..0839c9c08 100644 Binary files a/graphics/pokemon/azurill/footprint.png and b/graphics/pokemon/azurill/footprint.png differ diff --git a/graphics/pokemon/bagon/footprint.png b/graphics/pokemon/bagon/footprint.png index 9a93a7564..aec25f6ac 100644 Binary files a/graphics/pokemon/bagon/footprint.png and b/graphics/pokemon/bagon/footprint.png differ diff --git a/graphics/pokemon/baltoy/footprint.png b/graphics/pokemon/baltoy/footprint.png index 6965dbe60..a9b0e33c2 100644 Binary files a/graphics/pokemon/baltoy/footprint.png and b/graphics/pokemon/baltoy/footprint.png differ diff --git a/graphics/pokemon/banette/footprint.png b/graphics/pokemon/banette/footprint.png index a15814f2f..20f6b642e 100644 Binary files a/graphics/pokemon/banette/footprint.png and b/graphics/pokemon/banette/footprint.png differ diff --git a/graphics/pokemon/barbaracle/footprint.png b/graphics/pokemon/barbaracle/footprint.png index b36b1c3ee..6f1a76391 100644 Binary files a/graphics/pokemon/barbaracle/footprint.png and b/graphics/pokemon/barbaracle/footprint.png differ diff --git a/graphics/pokemon/barboach/footprint.png b/graphics/pokemon/barboach/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/barboach/footprint.png and b/graphics/pokemon/barboach/footprint.png differ diff --git a/graphics/pokemon/barraskewda/footprint.png b/graphics/pokemon/barraskewda/footprint.png index 795e7e445..2449369fd 100644 Binary files a/graphics/pokemon/barraskewda/footprint.png and b/graphics/pokemon/barraskewda/footprint.png differ diff --git a/graphics/pokemon/basculin/footprint.png b/graphics/pokemon/basculin/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/basculin/footprint.png and b/graphics/pokemon/basculin/footprint.png differ diff --git a/graphics/pokemon/bastiodon/footprint.png b/graphics/pokemon/bastiodon/footprint.png index cd62716e2..5193e88fd 100644 Binary files a/graphics/pokemon/bastiodon/footprint.png and b/graphics/pokemon/bastiodon/footprint.png differ diff --git a/graphics/pokemon/bayleef/footprint.png b/graphics/pokemon/bayleef/footprint.png index 04b375a7a..031cc5953 100644 Binary files a/graphics/pokemon/bayleef/footprint.png and b/graphics/pokemon/bayleef/footprint.png differ diff --git a/graphics/pokemon/beartic/footprint.png b/graphics/pokemon/beartic/footprint.png index 4e37e328a..e5ea2b38c 100644 Binary files a/graphics/pokemon/beartic/footprint.png and b/graphics/pokemon/beartic/footprint.png differ diff --git a/graphics/pokemon/beautifly/footprint.png b/graphics/pokemon/beautifly/footprint.png index 49175cb02..7111a8b70 100644 Binary files a/graphics/pokemon/beautifly/footprint.png and b/graphics/pokemon/beautifly/footprint.png differ diff --git a/graphics/pokemon/beedrill/footprint.png b/graphics/pokemon/beedrill/footprint.png index 5c3f21090..475d5235a 100644 Binary files a/graphics/pokemon/beedrill/footprint.png and b/graphics/pokemon/beedrill/footprint.png differ diff --git a/graphics/pokemon/beheeyem/footprint.png b/graphics/pokemon/beheeyem/footprint.png index a8c721650..b543fcf8b 100644 Binary files a/graphics/pokemon/beheeyem/footprint.png and b/graphics/pokemon/beheeyem/footprint.png differ diff --git a/graphics/pokemon/beldum/footprint.png b/graphics/pokemon/beldum/footprint.png index 0554eedfe..c4be8f0bf 100644 Binary files a/graphics/pokemon/beldum/footprint.png and b/graphics/pokemon/beldum/footprint.png differ diff --git a/graphics/pokemon/bellossom/footprint.png b/graphics/pokemon/bellossom/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/bellossom/footprint.png and b/graphics/pokemon/bellossom/footprint.png differ diff --git a/graphics/pokemon/bellsprout/footprint.png b/graphics/pokemon/bellsprout/footprint.png index 8fcf4f4f4..6a5edfd61 100644 Binary files a/graphics/pokemon/bellsprout/footprint.png and b/graphics/pokemon/bellsprout/footprint.png differ diff --git a/graphics/pokemon/bergmite/footprint.png b/graphics/pokemon/bergmite/footprint.png index 78eeb7b03..a9b0e33c2 100644 Binary files a/graphics/pokemon/bergmite/footprint.png and b/graphics/pokemon/bergmite/footprint.png differ diff --git a/graphics/pokemon/bewear/footprint.png b/graphics/pokemon/bewear/footprint.png index f754f203c..993ed501c 100644 Binary files a/graphics/pokemon/bewear/footprint.png and b/graphics/pokemon/bewear/footprint.png differ diff --git a/graphics/pokemon/bibarel/footprint.png b/graphics/pokemon/bibarel/footprint.png index 38f8717eb..f4fd8ac06 100644 Binary files a/graphics/pokemon/bibarel/footprint.png and b/graphics/pokemon/bibarel/footprint.png differ diff --git a/graphics/pokemon/bidoof/footprint.png b/graphics/pokemon/bidoof/footprint.png index 07c1cff78..18364358a 100644 Binary files a/graphics/pokemon/bidoof/footprint.png and b/graphics/pokemon/bidoof/footprint.png differ diff --git a/graphics/pokemon/binacle/footprint.png b/graphics/pokemon/binacle/footprint.png index 9430d4250..2449369fd 100644 Binary files a/graphics/pokemon/binacle/footprint.png and b/graphics/pokemon/binacle/footprint.png differ diff --git a/graphics/pokemon/bisharp/footprint.png b/graphics/pokemon/bisharp/footprint.png index 86e3eaf00..368eed2f2 100644 Binary files a/graphics/pokemon/bisharp/footprint.png and b/graphics/pokemon/bisharp/footprint.png differ diff --git a/graphics/pokemon/blacephalon/footprint.png b/graphics/pokemon/blacephalon/footprint.png index 7ae084ee5..6e8b15e7e 100644 Binary files a/graphics/pokemon/blacephalon/footprint.png and b/graphics/pokemon/blacephalon/footprint.png differ diff --git a/graphics/pokemon/blastoise/footprint.png b/graphics/pokemon/blastoise/footprint.png index b881f9270..c2d01389b 100644 Binary files a/graphics/pokemon/blastoise/footprint.png and b/graphics/pokemon/blastoise/footprint.png differ diff --git a/graphics/pokemon/blaziken/footprint.png b/graphics/pokemon/blaziken/footprint.png index cf18a353a..371621ba4 100644 Binary files a/graphics/pokemon/blaziken/footprint.png and b/graphics/pokemon/blaziken/footprint.png differ diff --git a/graphics/pokemon/blipbug/footprint.png b/graphics/pokemon/blipbug/footprint.png index 762f0b03a..2a1c1f3dd 100644 Binary files a/graphics/pokemon/blipbug/footprint.png and b/graphics/pokemon/blipbug/footprint.png differ diff --git a/graphics/pokemon/blissey/footprint.png b/graphics/pokemon/blissey/footprint.png index 3da3dbf93..ae7a7d533 100644 Binary files a/graphics/pokemon/blissey/footprint.png and b/graphics/pokemon/blissey/footprint.png differ diff --git a/graphics/pokemon/blitzle/footprint.png b/graphics/pokemon/blitzle/footprint.png index a805d8f4e..1e4af3a63 100644 Binary files a/graphics/pokemon/blitzle/footprint.png and b/graphics/pokemon/blitzle/footprint.png differ diff --git a/graphics/pokemon/boldore/footprint.png b/graphics/pokemon/boldore/footprint.png index f9a2cd710..587b0ee96 100644 Binary files a/graphics/pokemon/boldore/footprint.png and b/graphics/pokemon/boldore/footprint.png differ diff --git a/graphics/pokemon/boltund/footprint.png b/graphics/pokemon/boltund/footprint.png index 91e1defe9..aecf35c71 100644 Binary files a/graphics/pokemon/boltund/footprint.png and b/graphics/pokemon/boltund/footprint.png differ diff --git a/graphics/pokemon/bonsly/footprint.png b/graphics/pokemon/bonsly/footprint.png index 88392bd69..e6d890853 100644 Binary files a/graphics/pokemon/bonsly/footprint.png and b/graphics/pokemon/bonsly/footprint.png differ diff --git a/graphics/pokemon/bouffalant/footprint.png b/graphics/pokemon/bouffalant/footprint.png index 3415d1655..eb9040ca3 100644 Binary files a/graphics/pokemon/bouffalant/footprint.png and b/graphics/pokemon/bouffalant/footprint.png differ diff --git a/graphics/pokemon/bounsweet/footprint.png b/graphics/pokemon/bounsweet/footprint.png index 0ad5a272e..2a1c1f3dd 100644 Binary files a/graphics/pokemon/bounsweet/footprint.png and b/graphics/pokemon/bounsweet/footprint.png differ diff --git a/graphics/pokemon/braixen/footprint.png b/graphics/pokemon/braixen/footprint.png index 1efae6710..03f338c34 100644 Binary files a/graphics/pokemon/braixen/footprint.png and b/graphics/pokemon/braixen/footprint.png differ diff --git a/graphics/pokemon/braviary/footprint.png b/graphics/pokemon/braviary/footprint.png index be3a74fb0..692af6916 100644 Binary files a/graphics/pokemon/braviary/footprint.png and b/graphics/pokemon/braviary/footprint.png differ diff --git a/graphics/pokemon/breloom/footprint.png b/graphics/pokemon/breloom/footprint.png index 98d920669..7e940a5d7 100644 Binary files a/graphics/pokemon/breloom/footprint.png and b/graphics/pokemon/breloom/footprint.png differ diff --git a/graphics/pokemon/brionne/footprint.png b/graphics/pokemon/brionne/footprint.png index 7536a6250..2449369fd 100644 Binary files a/graphics/pokemon/brionne/footprint.png and b/graphics/pokemon/brionne/footprint.png differ diff --git a/graphics/pokemon/bronzong/footprint.png b/graphics/pokemon/bronzong/footprint.png index cf2b13c3a..2449369fd 100644 Binary files a/graphics/pokemon/bronzong/footprint.png and b/graphics/pokemon/bronzong/footprint.png differ diff --git a/graphics/pokemon/bronzor/footprint.png b/graphics/pokemon/bronzor/footprint.png index cf2b13c3a..2449369fd 100644 Binary files a/graphics/pokemon/bronzor/footprint.png and b/graphics/pokemon/bronzor/footprint.png differ diff --git a/graphics/pokemon/bruxish/footprint.png b/graphics/pokemon/bruxish/footprint.png index 9f97b57e6..2449369fd 100644 Binary files a/graphics/pokemon/bruxish/footprint.png and b/graphics/pokemon/bruxish/footprint.png differ diff --git a/graphics/pokemon/budew/footprint.png b/graphics/pokemon/budew/footprint.png index 374a42e5d..2a1c1f3dd 100644 Binary files a/graphics/pokemon/budew/footprint.png and b/graphics/pokemon/budew/footprint.png differ diff --git a/graphics/pokemon/buizel/footprint.png b/graphics/pokemon/buizel/footprint.png index f94d6b073..752c79917 100644 Binary files a/graphics/pokemon/buizel/footprint.png and b/graphics/pokemon/buizel/footprint.png differ diff --git a/graphics/pokemon/bulbasaur/footprint.png b/graphics/pokemon/bulbasaur/footprint.png index 8e9ab9c6b..6dafa96e2 100644 Binary files a/graphics/pokemon/bulbasaur/footprint.png and b/graphics/pokemon/bulbasaur/footprint.png differ diff --git a/graphics/pokemon/buneary/footprint.png b/graphics/pokemon/buneary/footprint.png index 59030d632..e5669275c 100644 Binary files a/graphics/pokemon/buneary/footprint.png and b/graphics/pokemon/buneary/footprint.png differ diff --git a/graphics/pokemon/bunnelby/footprint.png b/graphics/pokemon/bunnelby/footprint.png index b7ea8db09..c2c45ebec 100644 Binary files a/graphics/pokemon/bunnelby/footprint.png and b/graphics/pokemon/bunnelby/footprint.png differ diff --git a/graphics/pokemon/burmy/plant/footprint.png b/graphics/pokemon/burmy/plant/footprint.png index 2055799b3..2449369fd 100644 Binary files a/graphics/pokemon/burmy/plant/footprint.png and b/graphics/pokemon/burmy/plant/footprint.png differ diff --git a/graphics/pokemon/butterfree/footprint.png b/graphics/pokemon/butterfree/footprint.png index b2740e9cc..c6b4750d3 100644 Binary files a/graphics/pokemon/butterfree/footprint.png and b/graphics/pokemon/butterfree/footprint.png differ diff --git a/graphics/pokemon/buzzwole/footprint.png b/graphics/pokemon/buzzwole/footprint.png index 1e3f7c677..2a1c1f3dd 100644 Binary files a/graphics/pokemon/buzzwole/footprint.png and b/graphics/pokemon/buzzwole/footprint.png differ diff --git a/graphics/pokemon/cacnea/footprint.png b/graphics/pokemon/cacnea/footprint.png index 00b6a8a7e..92c2b235a 100644 Binary files a/graphics/pokemon/cacnea/footprint.png and b/graphics/pokemon/cacnea/footprint.png differ diff --git a/graphics/pokemon/cacturne/footprint.png b/graphics/pokemon/cacturne/footprint.png index 5441f92d6..a06f75fc9 100644 Binary files a/graphics/pokemon/cacturne/footprint.png and b/graphics/pokemon/cacturne/footprint.png differ diff --git a/graphics/pokemon/calyrex/footprint.png b/graphics/pokemon/calyrex/footprint.png index 9b96a7a1e..2a1c1f3dd 100644 Binary files a/graphics/pokemon/calyrex/footprint.png and b/graphics/pokemon/calyrex/footprint.png differ diff --git a/graphics/pokemon/camerupt/footprint.png b/graphics/pokemon/camerupt/footprint.png index 40708b8a1..81ec62104 100644 Binary files a/graphics/pokemon/camerupt/footprint.png and b/graphics/pokemon/camerupt/footprint.png differ diff --git a/graphics/pokemon/carbink/footprint.png b/graphics/pokemon/carbink/footprint.png index 9fcdf683a..2449369fd 100644 Binary files a/graphics/pokemon/carbink/footprint.png and b/graphics/pokemon/carbink/footprint.png differ diff --git a/graphics/pokemon/carkol/footprint.png b/graphics/pokemon/carkol/footprint.png index 628e18259..587b0ee96 100644 Binary files a/graphics/pokemon/carkol/footprint.png and b/graphics/pokemon/carkol/footprint.png differ diff --git a/graphics/pokemon/carnivine/footprint.png b/graphics/pokemon/carnivine/footprint.png index f9cc48ba7..2449369fd 100644 Binary files a/graphics/pokemon/carnivine/footprint.png and b/graphics/pokemon/carnivine/footprint.png differ diff --git a/graphics/pokemon/carracosta/footprint.png b/graphics/pokemon/carracosta/footprint.png index 285d6398e..964ebdcdf 100644 Binary files a/graphics/pokemon/carracosta/footprint.png and b/graphics/pokemon/carracosta/footprint.png differ diff --git a/graphics/pokemon/carvanha/footprint.png b/graphics/pokemon/carvanha/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/carvanha/footprint.png and b/graphics/pokemon/carvanha/footprint.png differ diff --git a/graphics/pokemon/cascoon/footprint.png b/graphics/pokemon/cascoon/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/cascoon/footprint.png and b/graphics/pokemon/cascoon/footprint.png differ diff --git a/graphics/pokemon/castform/footprint.png b/graphics/pokemon/castform/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/castform/footprint.png and b/graphics/pokemon/castform/footprint.png differ diff --git a/graphics/pokemon/caterpie/footprint.png b/graphics/pokemon/caterpie/footprint.png index c1c0058e7..2a1c1f3dd 100644 Binary files a/graphics/pokemon/caterpie/footprint.png and b/graphics/pokemon/caterpie/footprint.png differ diff --git a/graphics/pokemon/celebi/footprint.png b/graphics/pokemon/celebi/footprint.png index 11aa4301c..2e75f6793 100644 Binary files a/graphics/pokemon/celebi/footprint.png and b/graphics/pokemon/celebi/footprint.png differ diff --git a/graphics/pokemon/celesteela/footprint.png b/graphics/pokemon/celesteela/footprint.png index 190f28d20..db405c04b 100644 Binary files a/graphics/pokemon/celesteela/footprint.png and b/graphics/pokemon/celesteela/footprint.png differ diff --git a/graphics/pokemon/centiskorch/footprint.png b/graphics/pokemon/centiskorch/footprint.png index 084c77fda..2a1c1f3dd 100644 Binary files a/graphics/pokemon/centiskorch/footprint.png and b/graphics/pokemon/centiskorch/footprint.png differ diff --git a/graphics/pokemon/chandelure/footprint.png b/graphics/pokemon/chandelure/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/chandelure/footprint.png and b/graphics/pokemon/chandelure/footprint.png differ diff --git a/graphics/pokemon/chansey/footprint.png b/graphics/pokemon/chansey/footprint.png index 17893b9fb..20028e8b7 100644 Binary files a/graphics/pokemon/chansey/footprint.png and b/graphics/pokemon/chansey/footprint.png differ diff --git a/graphics/pokemon/charizard/footprint.png b/graphics/pokemon/charizard/footprint.png index e69f38392..86218af32 100644 Binary files a/graphics/pokemon/charizard/footprint.png and b/graphics/pokemon/charizard/footprint.png differ diff --git a/graphics/pokemon/charjabug/footprint.png b/graphics/pokemon/charjabug/footprint.png index 8dea358a4..2449369fd 100644 Binary files a/graphics/pokemon/charjabug/footprint.png and b/graphics/pokemon/charjabug/footprint.png differ diff --git a/graphics/pokemon/charmander/footprint.png b/graphics/pokemon/charmander/footprint.png index 2f7723621..9f0bcbdd9 100644 Binary files a/graphics/pokemon/charmander/footprint.png and b/graphics/pokemon/charmander/footprint.png differ diff --git a/graphics/pokemon/charmeleon/footprint.png b/graphics/pokemon/charmeleon/footprint.png index 6ec15ee20..87305df5b 100644 Binary files a/graphics/pokemon/charmeleon/footprint.png and b/graphics/pokemon/charmeleon/footprint.png differ diff --git a/graphics/pokemon/chatot/footprint.png b/graphics/pokemon/chatot/footprint.png index 61918db53..501f913dd 100644 Binary files a/graphics/pokemon/chatot/footprint.png and b/graphics/pokemon/chatot/footprint.png differ diff --git a/graphics/pokemon/cherrim/footprint.png b/graphics/pokemon/cherrim/footprint.png index 772eaa704..2a1c1f3dd 100644 Binary files a/graphics/pokemon/cherrim/footprint.png and b/graphics/pokemon/cherrim/footprint.png differ diff --git a/graphics/pokemon/cherubi/footprint.png b/graphics/pokemon/cherubi/footprint.png index 772eaa704..2a1c1f3dd 100644 Binary files a/graphics/pokemon/cherubi/footprint.png and b/graphics/pokemon/cherubi/footprint.png differ diff --git a/graphics/pokemon/chesnaught/footprint.png b/graphics/pokemon/chesnaught/footprint.png index 0f9d51ed7..56f48bb16 100644 Binary files a/graphics/pokemon/chesnaught/footprint.png and b/graphics/pokemon/chesnaught/footprint.png differ diff --git a/graphics/pokemon/chespin/footprint.png b/graphics/pokemon/chespin/footprint.png index 5b3235b71..d48fdfb52 100644 Binary files a/graphics/pokemon/chespin/footprint.png and b/graphics/pokemon/chespin/footprint.png differ diff --git a/graphics/pokemon/chewtle/footprint.png b/graphics/pokemon/chewtle/footprint.png index d7d12db04..86276e6d0 100644 Binary files a/graphics/pokemon/chewtle/footprint.png and b/graphics/pokemon/chewtle/footprint.png differ diff --git a/graphics/pokemon/chikorita/footprint.png b/graphics/pokemon/chikorita/footprint.png index 3ac4abd9f..bbb7102f6 100644 Binary files a/graphics/pokemon/chikorita/footprint.png and b/graphics/pokemon/chikorita/footprint.png differ diff --git a/graphics/pokemon/chimchar/footprint.png b/graphics/pokemon/chimchar/footprint.png index e9e4f8c82..da0826463 100644 Binary files a/graphics/pokemon/chimchar/footprint.png and b/graphics/pokemon/chimchar/footprint.png differ diff --git a/graphics/pokemon/chimecho/footprint.png b/graphics/pokemon/chimecho/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/chimecho/footprint.png and b/graphics/pokemon/chimecho/footprint.png differ diff --git a/graphics/pokemon/chinchou/footprint.png b/graphics/pokemon/chinchou/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/chinchou/footprint.png and b/graphics/pokemon/chinchou/footprint.png differ diff --git a/graphics/pokemon/chingling/footprint.png b/graphics/pokemon/chingling/footprint.png index b6f2ff3f2..7c0499f09 100644 Binary files a/graphics/pokemon/chingling/footprint.png and b/graphics/pokemon/chingling/footprint.png differ diff --git a/graphics/pokemon/cinccino/footprint.png b/graphics/pokemon/cinccino/footprint.png index ff503f6dc..792ed6538 100644 Binary files a/graphics/pokemon/cinccino/footprint.png and b/graphics/pokemon/cinccino/footprint.png differ diff --git a/graphics/pokemon/cinderace/footprint.png b/graphics/pokemon/cinderace/footprint.png index 18c62da8b..d46dc1df8 100644 Binary files a/graphics/pokemon/cinderace/footprint.png and b/graphics/pokemon/cinderace/footprint.png differ diff --git a/graphics/pokemon/clamperl/footprint.png b/graphics/pokemon/clamperl/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/clamperl/footprint.png and b/graphics/pokemon/clamperl/footprint.png differ diff --git a/graphics/pokemon/clauncher/footprint.png b/graphics/pokemon/clauncher/footprint.png index 201ec9bb6..a9b0e33c2 100644 Binary files a/graphics/pokemon/clauncher/footprint.png and b/graphics/pokemon/clauncher/footprint.png differ diff --git a/graphics/pokemon/clawitzer/footprint.png b/graphics/pokemon/clawitzer/footprint.png index 9d7bc6a1a..2449369fd 100644 Binary files a/graphics/pokemon/clawitzer/footprint.png and b/graphics/pokemon/clawitzer/footprint.png differ diff --git a/graphics/pokemon/claydol/footprint.png b/graphics/pokemon/claydol/footprint.png index 2f0bca1ac..ce84eba58 100644 Binary files a/graphics/pokemon/claydol/footprint.png and b/graphics/pokemon/claydol/footprint.png differ diff --git a/graphics/pokemon/clefable/footprint.png b/graphics/pokemon/clefable/footprint.png index 5ff3e19a1..2f3f60fbd 100644 Binary files a/graphics/pokemon/clefable/footprint.png and b/graphics/pokemon/clefable/footprint.png differ diff --git a/graphics/pokemon/clefairy/footprint.png b/graphics/pokemon/clefairy/footprint.png index 85c25a5dc..86276e6d0 100644 Binary files a/graphics/pokemon/clefairy/footprint.png and b/graphics/pokemon/clefairy/footprint.png differ diff --git a/graphics/pokemon/cleffa/footprint.png b/graphics/pokemon/cleffa/footprint.png index 4bf9339ae..e085ea10f 100644 Binary files a/graphics/pokemon/cleffa/footprint.png and b/graphics/pokemon/cleffa/footprint.png differ diff --git a/graphics/pokemon/clobbopus/footprint.png b/graphics/pokemon/clobbopus/footprint.png index 755d30849..adf2d1a6c 100644 Binary files a/graphics/pokemon/clobbopus/footprint.png and b/graphics/pokemon/clobbopus/footprint.png differ diff --git a/graphics/pokemon/cloyster/footprint.png b/graphics/pokemon/cloyster/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/cloyster/footprint.png and b/graphics/pokemon/cloyster/footprint.png differ diff --git a/graphics/pokemon/coalossal/footprint.png b/graphics/pokemon/coalossal/footprint.png index 7e2a55cf1..110dbc99f 100644 Binary files a/graphics/pokemon/coalossal/footprint.png and b/graphics/pokemon/coalossal/footprint.png differ diff --git a/graphics/pokemon/cobalion/footprint.png b/graphics/pokemon/cobalion/footprint.png index ad56dc261..587a5aedb 100644 Binary files a/graphics/pokemon/cobalion/footprint.png and b/graphics/pokemon/cobalion/footprint.png differ diff --git a/graphics/pokemon/cofagrigus/footprint.png b/graphics/pokemon/cofagrigus/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/cofagrigus/footprint.png and b/graphics/pokemon/cofagrigus/footprint.png differ diff --git a/graphics/pokemon/combee/footprint.png b/graphics/pokemon/combee/footprint.png index 2055799b3..2449369fd 100644 Binary files a/graphics/pokemon/combee/footprint.png and b/graphics/pokemon/combee/footprint.png differ diff --git a/graphics/pokemon/combusken/footprint.png b/graphics/pokemon/combusken/footprint.png index 6b66429d8..953e0e676 100644 Binary files a/graphics/pokemon/combusken/footprint.png and b/graphics/pokemon/combusken/footprint.png differ diff --git a/graphics/pokemon/comfey/footprint.png b/graphics/pokemon/comfey/footprint.png index 96f7256ab..2449369fd 100644 Binary files a/graphics/pokemon/comfey/footprint.png and b/graphics/pokemon/comfey/footprint.png differ diff --git a/graphics/pokemon/conkeldurr/footprint.png b/graphics/pokemon/conkeldurr/footprint.png index 5e55211e6..ab7670269 100644 Binary files a/graphics/pokemon/conkeldurr/footprint.png and b/graphics/pokemon/conkeldurr/footprint.png differ diff --git a/graphics/pokemon/copperajah/footprint.png b/graphics/pokemon/copperajah/footprint.png index 2436de108..dd2c3f960 100644 Binary files a/graphics/pokemon/copperajah/footprint.png and b/graphics/pokemon/copperajah/footprint.png differ diff --git a/graphics/pokemon/corphish/footprint.png b/graphics/pokemon/corphish/footprint.png index f624724c7..5717fd7f2 100644 Binary files a/graphics/pokemon/corphish/footprint.png and b/graphics/pokemon/corphish/footprint.png differ diff --git a/graphics/pokemon/corsola/footprint.png b/graphics/pokemon/corsola/footprint.png index bae0aaf92..458777ede 100644 Binary files a/graphics/pokemon/corsola/footprint.png and b/graphics/pokemon/corsola/footprint.png differ diff --git a/graphics/pokemon/corviknight/footprint.png b/graphics/pokemon/corviknight/footprint.png index 3042a0e45..ef4ad1a91 100644 Binary files a/graphics/pokemon/corviknight/footprint.png and b/graphics/pokemon/corviknight/footprint.png differ diff --git a/graphics/pokemon/corvisquire/footprint.png b/graphics/pokemon/corvisquire/footprint.png index 328be429b..8d9cd78e0 100644 Binary files a/graphics/pokemon/corvisquire/footprint.png and b/graphics/pokemon/corvisquire/footprint.png differ diff --git a/graphics/pokemon/cosmoem/footprint.png b/graphics/pokemon/cosmoem/footprint.png index 31cecc3ac..2449369fd 100644 Binary files a/graphics/pokemon/cosmoem/footprint.png and b/graphics/pokemon/cosmoem/footprint.png differ diff --git a/graphics/pokemon/cosmog/footprint.png b/graphics/pokemon/cosmog/footprint.png index a2fe0b64c..2449369fd 100644 Binary files a/graphics/pokemon/cosmog/footprint.png and b/graphics/pokemon/cosmog/footprint.png differ diff --git a/graphics/pokemon/cottonee/footprint.png b/graphics/pokemon/cottonee/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/cottonee/footprint.png and b/graphics/pokemon/cottonee/footprint.png differ diff --git a/graphics/pokemon/crabominable/footprint.png b/graphics/pokemon/crabominable/footprint.png index d67ceceee..03f338c34 100644 Binary files a/graphics/pokemon/crabominable/footprint.png and b/graphics/pokemon/crabominable/footprint.png differ diff --git a/graphics/pokemon/crabrawler/footprint.png b/graphics/pokemon/crabrawler/footprint.png index 665b3e97b..2a1c1f3dd 100644 Binary files a/graphics/pokemon/crabrawler/footprint.png and b/graphics/pokemon/crabrawler/footprint.png differ diff --git a/graphics/pokemon/cradily/footprint.png b/graphics/pokemon/cradily/footprint.png index 998229dc7..394b38da0 100644 Binary files a/graphics/pokemon/cradily/footprint.png and b/graphics/pokemon/cradily/footprint.png differ diff --git a/graphics/pokemon/cramorant/footprint.png b/graphics/pokemon/cramorant/footprint.png index 9c9bffb0c..fc06dcd4f 100644 Binary files a/graphics/pokemon/cramorant/footprint.png and b/graphics/pokemon/cramorant/footprint.png differ diff --git a/graphics/pokemon/cranidos/footprint.png b/graphics/pokemon/cranidos/footprint.png index 5c2c8c782..65718c63c 100644 Binary files a/graphics/pokemon/cranidos/footprint.png and b/graphics/pokemon/cranidos/footprint.png differ diff --git a/graphics/pokemon/crawdaunt/footprint.png b/graphics/pokemon/crawdaunt/footprint.png index 9169e2807..bedeeb01a 100644 Binary files a/graphics/pokemon/crawdaunt/footprint.png and b/graphics/pokemon/crawdaunt/footprint.png differ diff --git a/graphics/pokemon/cresselia/footprint.png b/graphics/pokemon/cresselia/footprint.png index a1e3ba06d..2449369fd 100644 Binary files a/graphics/pokemon/cresselia/footprint.png and b/graphics/pokemon/cresselia/footprint.png differ diff --git a/graphics/pokemon/croagunk/footprint.png b/graphics/pokemon/croagunk/footprint.png index b6c7cd165..54fe4e60b 100644 Binary files a/graphics/pokemon/croagunk/footprint.png and b/graphics/pokemon/croagunk/footprint.png differ diff --git a/graphics/pokemon/crobat/footprint.png b/graphics/pokemon/crobat/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/crobat/footprint.png and b/graphics/pokemon/crobat/footprint.png differ diff --git a/graphics/pokemon/croconaw/footprint.png b/graphics/pokemon/croconaw/footprint.png index 43da8e68e..4dec2924f 100644 Binary files a/graphics/pokemon/croconaw/footprint.png and b/graphics/pokemon/croconaw/footprint.png differ diff --git a/graphics/pokemon/crustle/footprint.png b/graphics/pokemon/crustle/footprint.png index 4cc2972cf..2a1c1f3dd 100644 Binary files a/graphics/pokemon/crustle/footprint.png and b/graphics/pokemon/crustle/footprint.png differ diff --git a/graphics/pokemon/cryogonal/footprint.png b/graphics/pokemon/cryogonal/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/cryogonal/footprint.png and b/graphics/pokemon/cryogonal/footprint.png differ diff --git a/graphics/pokemon/cubchoo/footprint.png b/graphics/pokemon/cubchoo/footprint.png index b2027716c..169bb4cf5 100644 Binary files a/graphics/pokemon/cubchoo/footprint.png and b/graphics/pokemon/cubchoo/footprint.png differ diff --git a/graphics/pokemon/cubone/footprint.png b/graphics/pokemon/cubone/footprint.png index 21deee1a6..46a6a9659 100644 Binary files a/graphics/pokemon/cubone/footprint.png and b/graphics/pokemon/cubone/footprint.png differ diff --git a/graphics/pokemon/cufant/footprint.png b/graphics/pokemon/cufant/footprint.png index 1f455d9d8..ebdb4a2ba 100644 Binary files a/graphics/pokemon/cufant/footprint.png and b/graphics/pokemon/cufant/footprint.png differ diff --git a/graphics/pokemon/cursola/footprint.png b/graphics/pokemon/cursola/footprint.png index 2a8e9ff35..458777ede 100644 Binary files a/graphics/pokemon/cursola/footprint.png and b/graphics/pokemon/cursola/footprint.png differ diff --git a/graphics/pokemon/cutiefly/footprint.png b/graphics/pokemon/cutiefly/footprint.png index b7587ca27..2a1c1f3dd 100644 Binary files a/graphics/pokemon/cutiefly/footprint.png and b/graphics/pokemon/cutiefly/footprint.png differ diff --git a/graphics/pokemon/cyndaquil/footprint.png b/graphics/pokemon/cyndaquil/footprint.png index 6413cbaae..ebdb4a2ba 100644 Binary files a/graphics/pokemon/cyndaquil/footprint.png and b/graphics/pokemon/cyndaquil/footprint.png differ diff --git a/graphics/pokemon/darkrai/footprint.png b/graphics/pokemon/darkrai/footprint.png index 8c3692e43..2a1c1f3dd 100644 Binary files a/graphics/pokemon/darkrai/footprint.png and b/graphics/pokemon/darkrai/footprint.png differ diff --git a/graphics/pokemon/darmanitan/footprint.png b/graphics/pokemon/darmanitan/footprint.png index 4d851ce7f..bd60d6c79 100644 Binary files a/graphics/pokemon/darmanitan/footprint.png and b/graphics/pokemon/darmanitan/footprint.png differ diff --git a/graphics/pokemon/dartrix/footprint.png b/graphics/pokemon/dartrix/footprint.png index 8a7eb236d..8d9cd78e0 100644 Binary files a/graphics/pokemon/dartrix/footprint.png and b/graphics/pokemon/dartrix/footprint.png differ diff --git a/graphics/pokemon/darumaka/footprint.png b/graphics/pokemon/darumaka/footprint.png index 09eba937b..b6dd8595c 100644 Binary files a/graphics/pokemon/darumaka/footprint.png and b/graphics/pokemon/darumaka/footprint.png differ diff --git a/graphics/pokemon/decidueye/footprint.png b/graphics/pokemon/decidueye/footprint.png index 8061657a7..a5b235dc8 100644 Binary files a/graphics/pokemon/decidueye/footprint.png and b/graphics/pokemon/decidueye/footprint.png differ diff --git a/graphics/pokemon/dedenne/footprint.png b/graphics/pokemon/dedenne/footprint.png index 275b3dc7b..5e92deff2 100644 Binary files a/graphics/pokemon/dedenne/footprint.png and b/graphics/pokemon/dedenne/footprint.png differ diff --git a/graphics/pokemon/deerling/footprint.png b/graphics/pokemon/deerling/footprint.png index 1b699876b..faee4817b 100644 Binary files a/graphics/pokemon/deerling/footprint.png and b/graphics/pokemon/deerling/footprint.png differ diff --git a/graphics/pokemon/deino/footprint.png b/graphics/pokemon/deino/footprint.png index 4451e5713..e65ee0901 100644 Binary files a/graphics/pokemon/deino/footprint.png and b/graphics/pokemon/deino/footprint.png differ diff --git a/graphics/pokemon/delcatty/footprint.png b/graphics/pokemon/delcatty/footprint.png index 5ff40e5a0..58035e1ae 100644 Binary files a/graphics/pokemon/delcatty/footprint.png and b/graphics/pokemon/delcatty/footprint.png differ diff --git a/graphics/pokemon/delibird/footprint.png b/graphics/pokemon/delibird/footprint.png index e7348586e..56baaef90 100644 Binary files a/graphics/pokemon/delibird/footprint.png and b/graphics/pokemon/delibird/footprint.png differ diff --git a/graphics/pokemon/delphox/footprint.png b/graphics/pokemon/delphox/footprint.png index abb8462b3..52c60fcab 100644 Binary files a/graphics/pokemon/delphox/footprint.png and b/graphics/pokemon/delphox/footprint.png differ diff --git a/graphics/pokemon/deoxys/footprint.png b/graphics/pokemon/deoxys/footprint.png index ea97e4014..31270c17c 100644 Binary files a/graphics/pokemon/deoxys/footprint.png and b/graphics/pokemon/deoxys/footprint.png differ diff --git a/graphics/pokemon/dewgong/footprint.png b/graphics/pokemon/dewgong/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/dewgong/footprint.png and b/graphics/pokemon/dewgong/footprint.png differ diff --git a/graphics/pokemon/dewott/footprint.png b/graphics/pokemon/dewott/footprint.png index 1a0d6f37f..2ef60e49b 100644 Binary files a/graphics/pokemon/dewott/footprint.png and b/graphics/pokemon/dewott/footprint.png differ diff --git a/graphics/pokemon/dewpider/footprint.png b/graphics/pokemon/dewpider/footprint.png index 87f972b02..2a1c1f3dd 100644 Binary files a/graphics/pokemon/dewpider/footprint.png and b/graphics/pokemon/dewpider/footprint.png differ diff --git a/graphics/pokemon/dhelmise/footprint.png b/graphics/pokemon/dhelmise/footprint.png index 933d21b5a..2449369fd 100644 Binary files a/graphics/pokemon/dhelmise/footprint.png and b/graphics/pokemon/dhelmise/footprint.png differ diff --git a/graphics/pokemon/dialga/footprint.png b/graphics/pokemon/dialga/footprint.png index bba0048ca..635cc0048 100644 Binary files a/graphics/pokemon/dialga/footprint.png and b/graphics/pokemon/dialga/footprint.png differ diff --git a/graphics/pokemon/diancie/footprint.png b/graphics/pokemon/diancie/footprint.png index 9f46f6003..2449369fd 100644 Binary files a/graphics/pokemon/diancie/footprint.png and b/graphics/pokemon/diancie/footprint.png differ diff --git a/graphics/pokemon/diggersby/footprint.png b/graphics/pokemon/diggersby/footprint.png index 997244c7c..b702b37ce 100644 Binary files a/graphics/pokemon/diggersby/footprint.png and b/graphics/pokemon/diggersby/footprint.png differ diff --git a/graphics/pokemon/diglett/footprint.png b/graphics/pokemon/diglett/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/diglett/footprint.png and b/graphics/pokemon/diglett/footprint.png differ diff --git a/graphics/pokemon/ditto/footprint.png b/graphics/pokemon/ditto/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/ditto/footprint.png and b/graphics/pokemon/ditto/footprint.png differ diff --git a/graphics/pokemon/dodrio/footprint.png b/graphics/pokemon/dodrio/footprint.png index 34f85bfb3..045339f23 100644 Binary files a/graphics/pokemon/dodrio/footprint.png and b/graphics/pokemon/dodrio/footprint.png differ diff --git a/graphics/pokemon/doduo/footprint.png b/graphics/pokemon/doduo/footprint.png index 0710eca52..21ca1be91 100644 Binary files a/graphics/pokemon/doduo/footprint.png and b/graphics/pokemon/doduo/footprint.png differ diff --git a/graphics/pokemon/donphan/footprint.png b/graphics/pokemon/donphan/footprint.png index 394cf6457..0bb8543ed 100644 Binary files a/graphics/pokemon/donphan/footprint.png and b/graphics/pokemon/donphan/footprint.png differ diff --git a/graphics/pokemon/dottler/footprint.png b/graphics/pokemon/dottler/footprint.png index d1c72ca9c..5d01e97d6 100644 Binary files a/graphics/pokemon/dottler/footprint.png and b/graphics/pokemon/dottler/footprint.png differ diff --git a/graphics/pokemon/doublade/footprint.png b/graphics/pokemon/doublade/footprint.png index eac01614e..2449369fd 100644 Binary files a/graphics/pokemon/doublade/footprint.png and b/graphics/pokemon/doublade/footprint.png differ diff --git a/graphics/pokemon/dracovish/footprint.png b/graphics/pokemon/dracovish/footprint.png index 393a49c9e..d28f2a529 100644 Binary files a/graphics/pokemon/dracovish/footprint.png and b/graphics/pokemon/dracovish/footprint.png differ diff --git a/graphics/pokemon/dracozolt/footprint.png b/graphics/pokemon/dracozolt/footprint.png index 61e4db301..d28f2a529 100644 Binary files a/graphics/pokemon/dracozolt/footprint.png and b/graphics/pokemon/dracozolt/footprint.png differ diff --git a/graphics/pokemon/dragalge/footprint.png b/graphics/pokemon/dragalge/footprint.png index 4320ad16d..2449369fd 100644 Binary files a/graphics/pokemon/dragalge/footprint.png and b/graphics/pokemon/dragalge/footprint.png differ diff --git a/graphics/pokemon/dragapult/footprint.png b/graphics/pokemon/dragapult/footprint.png index 74f6dcf3c..374328211 100644 Binary files a/graphics/pokemon/dragapult/footprint.png and b/graphics/pokemon/dragapult/footprint.png differ diff --git a/graphics/pokemon/dragonair/footprint.png b/graphics/pokemon/dragonair/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/dragonair/footprint.png and b/graphics/pokemon/dragonair/footprint.png differ diff --git a/graphics/pokemon/dragonite/footprint.png b/graphics/pokemon/dragonite/footprint.png index 1f41296b0..d28f2a529 100644 Binary files a/graphics/pokemon/dragonite/footprint.png and b/graphics/pokemon/dragonite/footprint.png differ diff --git a/graphics/pokemon/drakloak/footprint.png b/graphics/pokemon/drakloak/footprint.png index a73855356..2a1c1f3dd 100644 Binary files a/graphics/pokemon/drakloak/footprint.png and b/graphics/pokemon/drakloak/footprint.png differ diff --git a/graphics/pokemon/drampa/footprint.png b/graphics/pokemon/drampa/footprint.png index 63bc4a257..2449369fd 100644 Binary files a/graphics/pokemon/drampa/footprint.png and b/graphics/pokemon/drampa/footprint.png differ diff --git a/graphics/pokemon/drapion/footprint.png b/graphics/pokemon/drapion/footprint.png index 486780c2a..a9b0e33c2 100644 Binary files a/graphics/pokemon/drapion/footprint.png and b/graphics/pokemon/drapion/footprint.png differ diff --git a/graphics/pokemon/dratini/footprint.png b/graphics/pokemon/dratini/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/dratini/footprint.png and b/graphics/pokemon/dratini/footprint.png differ diff --git a/graphics/pokemon/drednaw/footprint.png b/graphics/pokemon/drednaw/footprint.png index f6da8b76b..d837294f9 100644 Binary files a/graphics/pokemon/drednaw/footprint.png and b/graphics/pokemon/drednaw/footprint.png differ diff --git a/graphics/pokemon/dreepy/footprint.png b/graphics/pokemon/dreepy/footprint.png index ff7379baa..2449369fd 100644 Binary files a/graphics/pokemon/dreepy/footprint.png and b/graphics/pokemon/dreepy/footprint.png differ diff --git a/graphics/pokemon/drifblim/footprint.png b/graphics/pokemon/drifblim/footprint.png index 1e52ea608..2449369fd 100644 Binary files a/graphics/pokemon/drifblim/footprint.png and b/graphics/pokemon/drifblim/footprint.png differ diff --git a/graphics/pokemon/drifloon/footprint.png b/graphics/pokemon/drifloon/footprint.png index 1e52ea608..2449369fd 100644 Binary files a/graphics/pokemon/drifloon/footprint.png and b/graphics/pokemon/drifloon/footprint.png differ diff --git a/graphics/pokemon/drilbur/footprint.png b/graphics/pokemon/drilbur/footprint.png index 2da2d3189..cfac8c0ac 100644 Binary files a/graphics/pokemon/drilbur/footprint.png and b/graphics/pokemon/drilbur/footprint.png differ diff --git a/graphics/pokemon/drizzile/footprint.png b/graphics/pokemon/drizzile/footprint.png index bda00c213..a34da31ca 100644 Binary files a/graphics/pokemon/drizzile/footprint.png and b/graphics/pokemon/drizzile/footprint.png differ diff --git a/graphics/pokemon/drowzee/footprint.png b/graphics/pokemon/drowzee/footprint.png index 23293423e..fcc93432e 100644 Binary files a/graphics/pokemon/drowzee/footprint.png and b/graphics/pokemon/drowzee/footprint.png differ diff --git a/graphics/pokemon/druddigon/footprint.png b/graphics/pokemon/druddigon/footprint.png index 958d56379..67f3bb6f3 100644 Binary files a/graphics/pokemon/druddigon/footprint.png and b/graphics/pokemon/druddigon/footprint.png differ diff --git a/graphics/pokemon/dubwool/footprint.png b/graphics/pokemon/dubwool/footprint.png index c302e113b..63cfc9038 100644 Binary files a/graphics/pokemon/dubwool/footprint.png and b/graphics/pokemon/dubwool/footprint.png differ diff --git a/graphics/pokemon/ducklett/footprint.png b/graphics/pokemon/ducklett/footprint.png index 855e05c4f..d7babe58f 100644 Binary files a/graphics/pokemon/ducklett/footprint.png and b/graphics/pokemon/ducklett/footprint.png differ diff --git a/graphics/pokemon/dugtrio/footprint.png b/graphics/pokemon/dugtrio/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/dugtrio/footprint.png and b/graphics/pokemon/dugtrio/footprint.png differ diff --git a/graphics/pokemon/dunsparce/footprint.png b/graphics/pokemon/dunsparce/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/dunsparce/footprint.png and b/graphics/pokemon/dunsparce/footprint.png differ diff --git a/graphics/pokemon/duosion/footprint.png b/graphics/pokemon/duosion/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/duosion/footprint.png and b/graphics/pokemon/duosion/footprint.png differ diff --git a/graphics/pokemon/duraludon/footprint.png b/graphics/pokemon/duraludon/footprint.png index e723bbd39..c0d2b88c5 100644 Binary files a/graphics/pokemon/duraludon/footprint.png and b/graphics/pokemon/duraludon/footprint.png differ diff --git a/graphics/pokemon/durant/footprint.png b/graphics/pokemon/durant/footprint.png index ca99591d4..a9b0e33c2 100644 Binary files a/graphics/pokemon/durant/footprint.png and b/graphics/pokemon/durant/footprint.png differ diff --git a/graphics/pokemon/dusclops/footprint.png b/graphics/pokemon/dusclops/footprint.png index 752ffa353..86cb1fbc8 100644 Binary files a/graphics/pokemon/dusclops/footprint.png and b/graphics/pokemon/dusclops/footprint.png differ diff --git a/graphics/pokemon/dusknoir/footprint.png b/graphics/pokemon/dusknoir/footprint.png index ba82cd69e..2449369fd 100644 Binary files a/graphics/pokemon/dusknoir/footprint.png and b/graphics/pokemon/dusknoir/footprint.png differ diff --git a/graphics/pokemon/duskull/footprint.png b/graphics/pokemon/duskull/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/duskull/footprint.png and b/graphics/pokemon/duskull/footprint.png differ diff --git a/graphics/pokemon/dustox/footprint.png b/graphics/pokemon/dustox/footprint.png index f7cc85bf9..ea2aae4e8 100644 Binary files a/graphics/pokemon/dustox/footprint.png and b/graphics/pokemon/dustox/footprint.png differ diff --git a/graphics/pokemon/dwebble/footprint.png b/graphics/pokemon/dwebble/footprint.png index c4fdc5673..a9b0e33c2 100644 Binary files a/graphics/pokemon/dwebble/footprint.png and b/graphics/pokemon/dwebble/footprint.png differ diff --git a/graphics/pokemon/eelektrik/footprint.png b/graphics/pokemon/eelektrik/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/eelektrik/footprint.png and b/graphics/pokemon/eelektrik/footprint.png differ diff --git a/graphics/pokemon/eelektross/footprint.png b/graphics/pokemon/eelektross/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/eelektross/footprint.png and b/graphics/pokemon/eelektross/footprint.png differ diff --git a/graphics/pokemon/eevee/footprint.png b/graphics/pokemon/eevee/footprint.png index 4e4c01c9f..793daaba5 100644 Binary files a/graphics/pokemon/eevee/footprint.png and b/graphics/pokemon/eevee/footprint.png differ diff --git a/graphics/pokemon/eiscue/footprint.png b/graphics/pokemon/eiscue/footprint.png index c57938799..fe4a161d6 100644 Binary files a/graphics/pokemon/eiscue/footprint.png and b/graphics/pokemon/eiscue/footprint.png differ diff --git a/graphics/pokemon/ekans/footprint.png b/graphics/pokemon/ekans/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/ekans/footprint.png and b/graphics/pokemon/ekans/footprint.png differ diff --git a/graphics/pokemon/eldegoss/footprint.png b/graphics/pokemon/eldegoss/footprint.png index 78c5766d5..2449369fd 100644 Binary files a/graphics/pokemon/eldegoss/footprint.png and b/graphics/pokemon/eldegoss/footprint.png differ diff --git a/graphics/pokemon/electabuzz/footprint.png b/graphics/pokemon/electabuzz/footprint.png index b2b4de625..19608da7a 100644 Binary files a/graphics/pokemon/electabuzz/footprint.png and b/graphics/pokemon/electabuzz/footprint.png differ diff --git a/graphics/pokemon/electivire/footprint.png b/graphics/pokemon/electivire/footprint.png index c03f36b87..8a8c6954d 100644 Binary files a/graphics/pokemon/electivire/footprint.png and b/graphics/pokemon/electivire/footprint.png differ diff --git a/graphics/pokemon/electrike/footprint.png b/graphics/pokemon/electrike/footprint.png index 8dd914b35..03f78314d 100644 Binary files a/graphics/pokemon/electrike/footprint.png and b/graphics/pokemon/electrike/footprint.png differ diff --git a/graphics/pokemon/electrode/footprint.png b/graphics/pokemon/electrode/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/electrode/footprint.png and b/graphics/pokemon/electrode/footprint.png differ diff --git a/graphics/pokemon/elekid/footprint.png b/graphics/pokemon/elekid/footprint.png index 15547931c..2b072fbae 100644 Binary files a/graphics/pokemon/elekid/footprint.png and b/graphics/pokemon/elekid/footprint.png differ diff --git a/graphics/pokemon/elgyem/footprint.png b/graphics/pokemon/elgyem/footprint.png index 96a13b7b8..c2c45ebec 100644 Binary files a/graphics/pokemon/elgyem/footprint.png and b/graphics/pokemon/elgyem/footprint.png differ diff --git a/graphics/pokemon/emboar/footprint.png b/graphics/pokemon/emboar/footprint.png index dc1ab2f07..d23234613 100644 Binary files a/graphics/pokemon/emboar/footprint.png and b/graphics/pokemon/emboar/footprint.png differ diff --git a/graphics/pokemon/emolga/footprint.png b/graphics/pokemon/emolga/footprint.png index aeba5b9eb..c52d410dd 100644 Binary files a/graphics/pokemon/emolga/footprint.png and b/graphics/pokemon/emolga/footprint.png differ diff --git a/graphics/pokemon/empoleon/footprint.png b/graphics/pokemon/empoleon/footprint.png index f9eeaf358..3b6170fe1 100644 Binary files a/graphics/pokemon/empoleon/footprint.png and b/graphics/pokemon/empoleon/footprint.png differ diff --git a/graphics/pokemon/entei/footprint.png b/graphics/pokemon/entei/footprint.png index 7336df599..50470342a 100644 Binary files a/graphics/pokemon/entei/footprint.png and b/graphics/pokemon/entei/footprint.png differ diff --git a/graphics/pokemon/escavalier/footprint.png b/graphics/pokemon/escavalier/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/escavalier/footprint.png and b/graphics/pokemon/escavalier/footprint.png differ diff --git a/graphics/pokemon/espeon/footprint.png b/graphics/pokemon/espeon/footprint.png index c7b17a4ad..0d975c620 100644 Binary files a/graphics/pokemon/espeon/footprint.png and b/graphics/pokemon/espeon/footprint.png differ diff --git a/graphics/pokemon/espurr/footprint.png b/graphics/pokemon/espurr/footprint.png index ce84d4ad3..a9b0e33c2 100644 Binary files a/graphics/pokemon/espurr/footprint.png and b/graphics/pokemon/espurr/footprint.png differ diff --git a/graphics/pokemon/eternatus/footprint.png b/graphics/pokemon/eternatus/footprint.png index 7bc9c3e37..70813d215 100644 Binary files a/graphics/pokemon/eternatus/footprint.png and b/graphics/pokemon/eternatus/footprint.png differ diff --git a/graphics/pokemon/excadrill/footprint.png b/graphics/pokemon/excadrill/footprint.png index 3e12d3b80..83ea2d4d3 100644 Binary files a/graphics/pokemon/excadrill/footprint.png and b/graphics/pokemon/excadrill/footprint.png differ diff --git a/graphics/pokemon/exeggcute/footprint.png b/graphics/pokemon/exeggcute/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/exeggcute/footprint.png and b/graphics/pokemon/exeggcute/footprint.png differ diff --git a/graphics/pokemon/exeggutor/footprint.png b/graphics/pokemon/exeggutor/footprint.png index 6df7122f8..706de0bf4 100644 Binary files a/graphics/pokemon/exeggutor/footprint.png and b/graphics/pokemon/exeggutor/footprint.png differ diff --git a/graphics/pokemon/exploud/footprint.png b/graphics/pokemon/exploud/footprint.png index b27283a14..daecfd459 100644 Binary files a/graphics/pokemon/exploud/footprint.png and b/graphics/pokemon/exploud/footprint.png differ diff --git a/graphics/pokemon/falinks/footprint.png b/graphics/pokemon/falinks/footprint.png index b8befed87..458777ede 100644 Binary files a/graphics/pokemon/falinks/footprint.png and b/graphics/pokemon/falinks/footprint.png differ diff --git a/graphics/pokemon/farfetchd/footprint.png b/graphics/pokemon/farfetchd/footprint.png index 2f08f732d..cbfca034d 100644 Binary files a/graphics/pokemon/farfetchd/footprint.png and b/graphics/pokemon/farfetchd/footprint.png differ diff --git a/graphics/pokemon/fearow/footprint.png b/graphics/pokemon/fearow/footprint.png index 04ea7924d..82302a804 100644 Binary files a/graphics/pokemon/fearow/footprint.png and b/graphics/pokemon/fearow/footprint.png differ diff --git a/graphics/pokemon/feebas/footprint.png b/graphics/pokemon/feebas/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/feebas/footprint.png and b/graphics/pokemon/feebas/footprint.png differ diff --git a/graphics/pokemon/fennekin/footprint.png b/graphics/pokemon/fennekin/footprint.png index 6d63066d1..2a1c1f3dd 100644 Binary files a/graphics/pokemon/fennekin/footprint.png and b/graphics/pokemon/fennekin/footprint.png differ diff --git a/graphics/pokemon/feraligatr/footprint.png b/graphics/pokemon/feraligatr/footprint.png index efe894289..d1c37d88d 100644 Binary files a/graphics/pokemon/feraligatr/footprint.png and b/graphics/pokemon/feraligatr/footprint.png differ diff --git a/graphics/pokemon/ferroseed/footprint.png b/graphics/pokemon/ferroseed/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/ferroseed/footprint.png and b/graphics/pokemon/ferroseed/footprint.png differ diff --git a/graphics/pokemon/ferrothorn/footprint.png b/graphics/pokemon/ferrothorn/footprint.png index a754fdb9b..5e9b043d5 100644 Binary files a/graphics/pokemon/ferrothorn/footprint.png and b/graphics/pokemon/ferrothorn/footprint.png differ diff --git a/graphics/pokemon/finneon/footprint.png b/graphics/pokemon/finneon/footprint.png index 0a5cb2bb4..2449369fd 100644 Binary files a/graphics/pokemon/finneon/footprint.png and b/graphics/pokemon/finneon/footprint.png differ diff --git a/graphics/pokemon/flaaffy/footprint.png b/graphics/pokemon/flaaffy/footprint.png index d1695ec80..6824d2bb9 100644 Binary files a/graphics/pokemon/flaaffy/footprint.png and b/graphics/pokemon/flaaffy/footprint.png differ diff --git a/graphics/pokemon/flabebe/footprint.png b/graphics/pokemon/flabebe/footprint.png index e36ead8b4..2449369fd 100644 Binary files a/graphics/pokemon/flabebe/footprint.png and b/graphics/pokemon/flabebe/footprint.png differ diff --git a/graphics/pokemon/flapple/footprint.png b/graphics/pokemon/flapple/footprint.png index c17ef139a..2449369fd 100644 Binary files a/graphics/pokemon/flapple/footprint.png and b/graphics/pokemon/flapple/footprint.png differ diff --git a/graphics/pokemon/flareon/footprint.png b/graphics/pokemon/flareon/footprint.png index db5d37ed4..aecf35c71 100644 Binary files a/graphics/pokemon/flareon/footprint.png and b/graphics/pokemon/flareon/footprint.png differ diff --git a/graphics/pokemon/fletchinder/footprint.png b/graphics/pokemon/fletchinder/footprint.png index 964998764..3d196a200 100644 Binary files a/graphics/pokemon/fletchinder/footprint.png and b/graphics/pokemon/fletchinder/footprint.png differ diff --git a/graphics/pokemon/fletchling/footprint.png b/graphics/pokemon/fletchling/footprint.png index 164e6b88f..bf35d516f 100644 Binary files a/graphics/pokemon/fletchling/footprint.png and b/graphics/pokemon/fletchling/footprint.png differ diff --git a/graphics/pokemon/floatzel/footprint.png b/graphics/pokemon/floatzel/footprint.png index d5c3ccc2a..1b6475d68 100644 Binary files a/graphics/pokemon/floatzel/footprint.png and b/graphics/pokemon/floatzel/footprint.png differ diff --git a/graphics/pokemon/floette/footprint.png b/graphics/pokemon/floette/footprint.png index fc6240d71..2449369fd 100644 Binary files a/graphics/pokemon/floette/footprint.png and b/graphics/pokemon/floette/footprint.png differ diff --git a/graphics/pokemon/florges/footprint.png b/graphics/pokemon/florges/footprint.png index 09e52b3cd..2449369fd 100644 Binary files a/graphics/pokemon/florges/footprint.png and b/graphics/pokemon/florges/footprint.png differ diff --git a/graphics/pokemon/flygon/footprint.png b/graphics/pokemon/flygon/footprint.png index 5af877878..ef9f392cf 100644 Binary files a/graphics/pokemon/flygon/footprint.png and b/graphics/pokemon/flygon/footprint.png differ diff --git a/graphics/pokemon/fomantis/footprint.png b/graphics/pokemon/fomantis/footprint.png index 91b583cfd..2a1c1f3dd 100644 Binary files a/graphics/pokemon/fomantis/footprint.png and b/graphics/pokemon/fomantis/footprint.png differ diff --git a/graphics/pokemon/foongus/footprint.png b/graphics/pokemon/foongus/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/foongus/footprint.png and b/graphics/pokemon/foongus/footprint.png differ diff --git a/graphics/pokemon/forretress/footprint.png b/graphics/pokemon/forretress/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/forretress/footprint.png and b/graphics/pokemon/forretress/footprint.png differ diff --git a/graphics/pokemon/fraxure/footprint.png b/graphics/pokemon/fraxure/footprint.png index 25a6a7dc7..706be6428 100644 Binary files a/graphics/pokemon/fraxure/footprint.png and b/graphics/pokemon/fraxure/footprint.png differ diff --git a/graphics/pokemon/frillish/footprint.png b/graphics/pokemon/frillish/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/frillish/footprint.png and b/graphics/pokemon/frillish/footprint.png differ diff --git a/graphics/pokemon/froakie/footprint.png b/graphics/pokemon/froakie/footprint.png index 3c3ada42a..f343dd885 100644 Binary files a/graphics/pokemon/froakie/footprint.png and b/graphics/pokemon/froakie/footprint.png differ diff --git a/graphics/pokemon/frogadier/footprint.png b/graphics/pokemon/frogadier/footprint.png index d19aa2f7a..da320867f 100644 Binary files a/graphics/pokemon/frogadier/footprint.png and b/graphics/pokemon/frogadier/footprint.png differ diff --git a/graphics/pokemon/froslass/footprint.png b/graphics/pokemon/froslass/footprint.png index ba82cd69e..2449369fd 100644 Binary files a/graphics/pokemon/froslass/footprint.png and b/graphics/pokemon/froslass/footprint.png differ diff --git a/graphics/pokemon/frosmoth/footprint.png b/graphics/pokemon/frosmoth/footprint.png index 4b1ebb9b7..2449369fd 100644 Binary files a/graphics/pokemon/frosmoth/footprint.png and b/graphics/pokemon/frosmoth/footprint.png differ diff --git a/graphics/pokemon/furfrou/footprint.png b/graphics/pokemon/furfrou/footprint.png index 32ceac681..03f338c34 100644 Binary files a/graphics/pokemon/furfrou/footprint.png and b/graphics/pokemon/furfrou/footprint.png differ diff --git a/graphics/pokemon/furret/footprint.png b/graphics/pokemon/furret/footprint.png index 225445fb3..cfbf00114 100644 Binary files a/graphics/pokemon/furret/footprint.png and b/graphics/pokemon/furret/footprint.png differ diff --git a/graphics/pokemon/gabite/footprint.png b/graphics/pokemon/gabite/footprint.png index bcc2e9a9f..19c947990 100644 Binary files a/graphics/pokemon/gabite/footprint.png and b/graphics/pokemon/gabite/footprint.png differ diff --git a/graphics/pokemon/gallade/footprint.png b/graphics/pokemon/gallade/footprint.png index 8ef34d69c..9d57a79dd 100644 Binary files a/graphics/pokemon/gallade/footprint.png and b/graphics/pokemon/gallade/footprint.png differ diff --git a/graphics/pokemon/galvantula/footprint.png b/graphics/pokemon/galvantula/footprint.png index 7c7fbf4db..7c0499f09 100644 Binary files a/graphics/pokemon/galvantula/footprint.png and b/graphics/pokemon/galvantula/footprint.png differ diff --git a/graphics/pokemon/garbodor/footprint.png b/graphics/pokemon/garbodor/footprint.png index 993270f31..e8982ee63 100644 Binary files a/graphics/pokemon/garbodor/footprint.png and b/graphics/pokemon/garbodor/footprint.png differ diff --git a/graphics/pokemon/garchomp/footprint.png b/graphics/pokemon/garchomp/footprint.png index 5a99bfa2e..74931e072 100644 Binary files a/graphics/pokemon/garchomp/footprint.png and b/graphics/pokemon/garchomp/footprint.png differ diff --git a/graphics/pokemon/gardevoir/footprint.png b/graphics/pokemon/gardevoir/footprint.png index fd9f4755b..cf81cde17 100644 Binary files a/graphics/pokemon/gardevoir/footprint.png and b/graphics/pokemon/gardevoir/footprint.png differ diff --git a/graphics/pokemon/gastly/footprint.png b/graphics/pokemon/gastly/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/gastly/footprint.png and b/graphics/pokemon/gastly/footprint.png differ diff --git a/graphics/pokemon/gastrodon/footprint.png b/graphics/pokemon/gastrodon/footprint.png index 4be498a7a..2502f58ea 100644 Binary files a/graphics/pokemon/gastrodon/footprint.png and b/graphics/pokemon/gastrodon/footprint.png differ diff --git a/graphics/pokemon/genesect/footprint.png b/graphics/pokemon/genesect/footprint.png index 6da2ad90d..298cb09e5 100644 Binary files a/graphics/pokemon/genesect/footprint.png and b/graphics/pokemon/genesect/footprint.png differ diff --git a/graphics/pokemon/gengar/footprint.png b/graphics/pokemon/gengar/footprint.png index 0eb8fcebf..3f806b400 100644 Binary files a/graphics/pokemon/gengar/footprint.png and b/graphics/pokemon/gengar/footprint.png differ diff --git a/graphics/pokemon/geodude/footprint.png b/graphics/pokemon/geodude/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/geodude/footprint.png and b/graphics/pokemon/geodude/footprint.png differ diff --git a/graphics/pokemon/gible/footprint.png b/graphics/pokemon/gible/footprint.png index 7e56f1f8e..a7ab331c1 100644 Binary files a/graphics/pokemon/gible/footprint.png and b/graphics/pokemon/gible/footprint.png differ diff --git a/graphics/pokemon/gigalith/footprint.png b/graphics/pokemon/gigalith/footprint.png index c4d874a1e..c67644d5d 100644 Binary files a/graphics/pokemon/gigalith/footprint.png and b/graphics/pokemon/gigalith/footprint.png differ diff --git a/graphics/pokemon/girafarig/footprint.png b/graphics/pokemon/girafarig/footprint.png index f7af3f622..86ebcfc5f 100644 Binary files a/graphics/pokemon/girafarig/footprint.png and b/graphics/pokemon/girafarig/footprint.png differ diff --git a/graphics/pokemon/giratina/footprint.png b/graphics/pokemon/giratina/footprint.png index a763213cd..33a274fd7 100644 Binary files a/graphics/pokemon/giratina/footprint.png and b/graphics/pokemon/giratina/footprint.png differ diff --git a/graphics/pokemon/glaceon/footprint.png b/graphics/pokemon/glaceon/footprint.png index d176ea9fd..43b2a5a65 100644 Binary files a/graphics/pokemon/glaceon/footprint.png and b/graphics/pokemon/glaceon/footprint.png differ diff --git a/graphics/pokemon/glalie/footprint.png b/graphics/pokemon/glalie/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/glalie/footprint.png and b/graphics/pokemon/glalie/footprint.png differ diff --git a/graphics/pokemon/glameow/footprint.png b/graphics/pokemon/glameow/footprint.png index 938a0af32..323482bd9 100644 Binary files a/graphics/pokemon/glameow/footprint.png and b/graphics/pokemon/glameow/footprint.png differ diff --git a/graphics/pokemon/glastrier/footprint.png b/graphics/pokemon/glastrier/footprint.png index cf32331ce..594e5b303 100644 Binary files a/graphics/pokemon/glastrier/footprint.png and b/graphics/pokemon/glastrier/footprint.png differ diff --git a/graphics/pokemon/gligar/footprint.png b/graphics/pokemon/gligar/footprint.png index 3ca9864f0..e87332587 100644 Binary files a/graphics/pokemon/gligar/footprint.png and b/graphics/pokemon/gligar/footprint.png differ diff --git a/graphics/pokemon/gliscor/footprint.png b/graphics/pokemon/gliscor/footprint.png index 665b9af00..ab24720b6 100644 Binary files a/graphics/pokemon/gliscor/footprint.png and b/graphics/pokemon/gliscor/footprint.png differ diff --git a/graphics/pokemon/gloom/footprint.png b/graphics/pokemon/gloom/footprint.png index 7e9c265e8..13ca4ee71 100644 Binary files a/graphics/pokemon/gloom/footprint.png and b/graphics/pokemon/gloom/footprint.png differ diff --git a/graphics/pokemon/gogoat/footprint.png b/graphics/pokemon/gogoat/footprint.png index a74181123..73f66988d 100644 Binary files a/graphics/pokemon/gogoat/footprint.png and b/graphics/pokemon/gogoat/footprint.png differ diff --git a/graphics/pokemon/golbat/footprint.png b/graphics/pokemon/golbat/footprint.png index 65c126fb3..ebdf4cafa 100644 Binary files a/graphics/pokemon/golbat/footprint.png and b/graphics/pokemon/golbat/footprint.png differ diff --git a/graphics/pokemon/goldeen/footprint.png b/graphics/pokemon/goldeen/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/goldeen/footprint.png and b/graphics/pokemon/goldeen/footprint.png differ diff --git a/graphics/pokemon/golduck/footprint.png b/graphics/pokemon/golduck/footprint.png index 63ba752e4..1835eb867 100644 Binary files a/graphics/pokemon/golduck/footprint.png and b/graphics/pokemon/golduck/footprint.png differ diff --git a/graphics/pokemon/golem/footprint.png b/graphics/pokemon/golem/footprint.png index 8ddc6345c..c9f614442 100644 Binary files a/graphics/pokemon/golem/footprint.png and b/graphics/pokemon/golem/footprint.png differ diff --git a/graphics/pokemon/golett/footprint.png b/graphics/pokemon/golett/footprint.png index 3eba34f93..aeae5e658 100644 Binary files a/graphics/pokemon/golett/footprint.png and b/graphics/pokemon/golett/footprint.png differ diff --git a/graphics/pokemon/golisopod/footprint.png b/graphics/pokemon/golisopod/footprint.png index 7da39e2aa..b59cb9b7b 100644 Binary files a/graphics/pokemon/golisopod/footprint.png and b/graphics/pokemon/golisopod/footprint.png differ diff --git a/graphics/pokemon/golurk/footprint.png b/graphics/pokemon/golurk/footprint.png index 7e7cfce2f..661694ffd 100644 Binary files a/graphics/pokemon/golurk/footprint.png and b/graphics/pokemon/golurk/footprint.png differ diff --git a/graphics/pokemon/goodra/footprint.png b/graphics/pokemon/goodra/footprint.png index 875eae332..115802fa8 100644 Binary files a/graphics/pokemon/goodra/footprint.png and b/graphics/pokemon/goodra/footprint.png differ diff --git a/graphics/pokemon/goomy/footprint.png b/graphics/pokemon/goomy/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/goomy/footprint.png and b/graphics/pokemon/goomy/footprint.png differ diff --git a/graphics/pokemon/gorebyss/footprint.png b/graphics/pokemon/gorebyss/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/gorebyss/footprint.png and b/graphics/pokemon/gorebyss/footprint.png differ diff --git a/graphics/pokemon/gossifleur/footprint.png b/graphics/pokemon/gossifleur/footprint.png index 0efe7646a..01abc74f1 100644 Binary files a/graphics/pokemon/gossifleur/footprint.png and b/graphics/pokemon/gossifleur/footprint.png differ diff --git a/graphics/pokemon/gothita/footprint.png b/graphics/pokemon/gothita/footprint.png index 4cc2972cf..2a1c1f3dd 100644 Binary files a/graphics/pokemon/gothita/footprint.png and b/graphics/pokemon/gothita/footprint.png differ diff --git a/graphics/pokemon/gothitelle/footprint.png b/graphics/pokemon/gothitelle/footprint.png index 64886b8d3..83ea2d4d3 100644 Binary files a/graphics/pokemon/gothitelle/footprint.png and b/graphics/pokemon/gothitelle/footprint.png differ diff --git a/graphics/pokemon/gothorita/footprint.png b/graphics/pokemon/gothorita/footprint.png index e07adc3b0..90b49038e 100644 Binary files a/graphics/pokemon/gothorita/footprint.png and b/graphics/pokemon/gothorita/footprint.png differ diff --git a/graphics/pokemon/gourgeist/footprint.png b/graphics/pokemon/gourgeist/footprint.png index 847f141b3..a9b0e33c2 100644 Binary files a/graphics/pokemon/gourgeist/footprint.png and b/graphics/pokemon/gourgeist/footprint.png differ diff --git a/graphics/pokemon/granbull/footprint.png b/graphics/pokemon/granbull/footprint.png index 010b5fb67..23e71ed4d 100644 Binary files a/graphics/pokemon/granbull/footprint.png and b/graphics/pokemon/granbull/footprint.png differ diff --git a/graphics/pokemon/grapploct/footprint.png b/graphics/pokemon/grapploct/footprint.png index ea3c59c40..2306c5b0b 100644 Binary files a/graphics/pokemon/grapploct/footprint.png and b/graphics/pokemon/grapploct/footprint.png differ diff --git a/graphics/pokemon/graveler/footprint.png b/graphics/pokemon/graveler/footprint.png index c836ad3f4..c3aacfe36 100644 Binary files a/graphics/pokemon/graveler/footprint.png and b/graphics/pokemon/graveler/footprint.png differ diff --git a/graphics/pokemon/greedent/footprint.png b/graphics/pokemon/greedent/footprint.png index d2e45203a..631f795dd 100644 Binary files a/graphics/pokemon/greedent/footprint.png and b/graphics/pokemon/greedent/footprint.png differ diff --git a/graphics/pokemon/greninja/footprint.png b/graphics/pokemon/greninja/footprint.png index c567377ea..de1657ccd 100644 Binary files a/graphics/pokemon/greninja/footprint.png and b/graphics/pokemon/greninja/footprint.png differ diff --git a/graphics/pokemon/grimer/footprint.png b/graphics/pokemon/grimer/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/grimer/footprint.png and b/graphics/pokemon/grimer/footprint.png differ diff --git a/graphics/pokemon/grimmsnarl/footprint.png b/graphics/pokemon/grimmsnarl/footprint.png index a3776b238..d28f2a529 100644 Binary files a/graphics/pokemon/grimmsnarl/footprint.png and b/graphics/pokemon/grimmsnarl/footprint.png differ diff --git a/graphics/pokemon/grookey/footprint.png b/graphics/pokemon/grookey/footprint.png index 836738bc0..631f795dd 100644 Binary files a/graphics/pokemon/grookey/footprint.png and b/graphics/pokemon/grookey/footprint.png differ diff --git a/graphics/pokemon/grotle/footprint.png b/graphics/pokemon/grotle/footprint.png index d72c05265..7d99e95ba 100644 Binary files a/graphics/pokemon/grotle/footprint.png and b/graphics/pokemon/grotle/footprint.png differ diff --git a/graphics/pokemon/groudon/footprint.png b/graphics/pokemon/groudon/footprint.png index cb80ba48d..a7eaa14c9 100644 Binary files a/graphics/pokemon/groudon/footprint.png and b/graphics/pokemon/groudon/footprint.png differ diff --git a/graphics/pokemon/grovyle/footprint.png b/graphics/pokemon/grovyle/footprint.png index c78ea507c..149efec28 100644 Binary files a/graphics/pokemon/grovyle/footprint.png and b/graphics/pokemon/grovyle/footprint.png differ diff --git a/graphics/pokemon/growlithe/footprint.png b/graphics/pokemon/growlithe/footprint.png index 2517cdcba..b9af4c119 100644 Binary files a/graphics/pokemon/growlithe/footprint.png and b/graphics/pokemon/growlithe/footprint.png differ diff --git a/graphics/pokemon/grubbin/footprint.png b/graphics/pokemon/grubbin/footprint.png index aeac35bc5..2a1c1f3dd 100644 Binary files a/graphics/pokemon/grubbin/footprint.png and b/graphics/pokemon/grubbin/footprint.png differ diff --git a/graphics/pokemon/grumpig/footprint.png b/graphics/pokemon/grumpig/footprint.png index ddff0e500..deea60434 100644 Binary files a/graphics/pokemon/grumpig/footprint.png and b/graphics/pokemon/grumpig/footprint.png differ diff --git a/graphics/pokemon/gulpin/footprint.png b/graphics/pokemon/gulpin/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/gulpin/footprint.png and b/graphics/pokemon/gulpin/footprint.png differ diff --git a/graphics/pokemon/gumshoos/footprint.png b/graphics/pokemon/gumshoos/footprint.png index abc07274b..e1462e71a 100644 Binary files a/graphics/pokemon/gumshoos/footprint.png and b/graphics/pokemon/gumshoos/footprint.png differ diff --git a/graphics/pokemon/gurdurr/footprint.png b/graphics/pokemon/gurdurr/footprint.png index e85ff35cc..48bcbe110 100644 Binary files a/graphics/pokemon/gurdurr/footprint.png and b/graphics/pokemon/gurdurr/footprint.png differ diff --git a/graphics/pokemon/guzzlord/footprint.png b/graphics/pokemon/guzzlord/footprint.png index 9184adb9b..82befefa6 100644 Binary files a/graphics/pokemon/guzzlord/footprint.png and b/graphics/pokemon/guzzlord/footprint.png differ diff --git a/graphics/pokemon/gyarados/footprint.png b/graphics/pokemon/gyarados/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/gyarados/footprint.png and b/graphics/pokemon/gyarados/footprint.png differ diff --git a/graphics/pokemon/hakamo_o/footprint.png b/graphics/pokemon/hakamo_o/footprint.png index 137c8c5d7..e3e1b0a9c 100644 Binary files a/graphics/pokemon/hakamo_o/footprint.png and b/graphics/pokemon/hakamo_o/footprint.png differ diff --git a/graphics/pokemon/happiny/footprint.png b/graphics/pokemon/happiny/footprint.png index 54aff9113..fb5442036 100644 Binary files a/graphics/pokemon/happiny/footprint.png and b/graphics/pokemon/happiny/footprint.png differ diff --git a/graphics/pokemon/hariyama/footprint.png b/graphics/pokemon/hariyama/footprint.png index ab5d9f369..4c0cd23d3 100644 Binary files a/graphics/pokemon/hariyama/footprint.png and b/graphics/pokemon/hariyama/footprint.png differ diff --git a/graphics/pokemon/hatenna/footprint.png b/graphics/pokemon/hatenna/footprint.png index c133d134b..5d01e97d6 100644 Binary files a/graphics/pokemon/hatenna/footprint.png and b/graphics/pokemon/hatenna/footprint.png differ diff --git a/graphics/pokemon/hatterene/footprint.png b/graphics/pokemon/hatterene/footprint.png index bfb754ec3..2449369fd 100644 Binary files a/graphics/pokemon/hatterene/footprint.png and b/graphics/pokemon/hatterene/footprint.png differ diff --git a/graphics/pokemon/hattrem/footprint.png b/graphics/pokemon/hattrem/footprint.png index 83360f473..2a1c1f3dd 100644 Binary files a/graphics/pokemon/hattrem/footprint.png and b/graphics/pokemon/hattrem/footprint.png differ diff --git a/graphics/pokemon/haunter/footprint.png b/graphics/pokemon/haunter/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/haunter/footprint.png and b/graphics/pokemon/haunter/footprint.png differ diff --git a/graphics/pokemon/hawlucha/footprint.png b/graphics/pokemon/hawlucha/footprint.png index 830e22710..0c3a89ce3 100644 Binary files a/graphics/pokemon/hawlucha/footprint.png and b/graphics/pokemon/hawlucha/footprint.png differ diff --git a/graphics/pokemon/haxorus/footprint.png b/graphics/pokemon/haxorus/footprint.png index f54f3d5f3..e444b5cbe 100644 Binary files a/graphics/pokemon/haxorus/footprint.png and b/graphics/pokemon/haxorus/footprint.png differ diff --git a/graphics/pokemon/heatmor/footprint.png b/graphics/pokemon/heatmor/footprint.png index ee94b3107..53ff821e9 100644 Binary files a/graphics/pokemon/heatmor/footprint.png and b/graphics/pokemon/heatmor/footprint.png differ diff --git a/graphics/pokemon/heatran/footprint.png b/graphics/pokemon/heatran/footprint.png index 8e7258666..d19690143 100644 Binary files a/graphics/pokemon/heatran/footprint.png and b/graphics/pokemon/heatran/footprint.png differ diff --git a/graphics/pokemon/heliolisk/footprint.png b/graphics/pokemon/heliolisk/footprint.png index 583bc7062..837c9a0a8 100644 Binary files a/graphics/pokemon/heliolisk/footprint.png and b/graphics/pokemon/heliolisk/footprint.png differ diff --git a/graphics/pokemon/helioptile/footprint.png b/graphics/pokemon/helioptile/footprint.png index 40dddcd79..02d909c72 100644 Binary files a/graphics/pokemon/helioptile/footprint.png and b/graphics/pokemon/helioptile/footprint.png differ diff --git a/graphics/pokemon/heracross/footprint.png b/graphics/pokemon/heracross/footprint.png index a740a17c9..42bc4e3a0 100644 Binary files a/graphics/pokemon/heracross/footprint.png and b/graphics/pokemon/heracross/footprint.png differ diff --git a/graphics/pokemon/herdier/footprint.png b/graphics/pokemon/herdier/footprint.png index c618cf6d7..c2c45ebec 100644 Binary files a/graphics/pokemon/herdier/footprint.png and b/graphics/pokemon/herdier/footprint.png differ diff --git a/graphics/pokemon/hippopotas/footprint.png b/graphics/pokemon/hippopotas/footprint.png index 0993b7f1b..7230929c7 100644 Binary files a/graphics/pokemon/hippopotas/footprint.png and b/graphics/pokemon/hippopotas/footprint.png differ diff --git a/graphics/pokemon/hippowdon/footprint.png b/graphics/pokemon/hippowdon/footprint.png index ef52705ed..9c24e50bc 100644 Binary files a/graphics/pokemon/hippowdon/footprint.png and b/graphics/pokemon/hippowdon/footprint.png differ diff --git a/graphics/pokemon/hitmonchan/footprint.png b/graphics/pokemon/hitmonchan/footprint.png index cfd1efd54..4a185f878 100644 Binary files a/graphics/pokemon/hitmonchan/footprint.png and b/graphics/pokemon/hitmonchan/footprint.png differ diff --git a/graphics/pokemon/hitmonlee/footprint.png b/graphics/pokemon/hitmonlee/footprint.png index 505120110..466e6f81b 100644 Binary files a/graphics/pokemon/hitmonlee/footprint.png and b/graphics/pokemon/hitmonlee/footprint.png differ diff --git a/graphics/pokemon/hitmontop/footprint.png b/graphics/pokemon/hitmontop/footprint.png index ba8c1cca2..16e5173ce 100644 Binary files a/graphics/pokemon/hitmontop/footprint.png and b/graphics/pokemon/hitmontop/footprint.png differ diff --git a/graphics/pokemon/ho_oh/footprint.png b/graphics/pokemon/ho_oh/footprint.png index adceb3878..a6cfc377d 100644 Binary files a/graphics/pokemon/ho_oh/footprint.png and b/graphics/pokemon/ho_oh/footprint.png differ diff --git a/graphics/pokemon/honchkrow/footprint.png b/graphics/pokemon/honchkrow/footprint.png index d988cc84a..79c4f6643 100644 Binary files a/graphics/pokemon/honchkrow/footprint.png and b/graphics/pokemon/honchkrow/footprint.png differ diff --git a/graphics/pokemon/honedge/footprint.png b/graphics/pokemon/honedge/footprint.png index 8b00665b7..2449369fd 100644 Binary files a/graphics/pokemon/honedge/footprint.png and b/graphics/pokemon/honedge/footprint.png differ diff --git a/graphics/pokemon/hoopa/footprint.png b/graphics/pokemon/hoopa/footprint.png index 90b234496..2449369fd 100644 Binary files a/graphics/pokemon/hoopa/footprint.png and b/graphics/pokemon/hoopa/footprint.png differ diff --git a/graphics/pokemon/hoothoot/footprint.png b/graphics/pokemon/hoothoot/footprint.png index 1eacf9116..8be22e121 100644 Binary files a/graphics/pokemon/hoothoot/footprint.png and b/graphics/pokemon/hoothoot/footprint.png differ diff --git a/graphics/pokemon/hoppip/footprint.png b/graphics/pokemon/hoppip/footprint.png index 0be22ed86..d482d69e5 100644 Binary files a/graphics/pokemon/hoppip/footprint.png and b/graphics/pokemon/hoppip/footprint.png differ diff --git a/graphics/pokemon/horsea/footprint.png b/graphics/pokemon/horsea/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/horsea/footprint.png and b/graphics/pokemon/horsea/footprint.png differ diff --git a/graphics/pokemon/houndoom/footprint.png b/graphics/pokemon/houndoom/footprint.png index b1f2c80f4..f2ba4670a 100644 Binary files a/graphics/pokemon/houndoom/footprint.png and b/graphics/pokemon/houndoom/footprint.png differ diff --git a/graphics/pokemon/houndour/footprint.png b/graphics/pokemon/houndour/footprint.png index 3f8161431..bbc1115d7 100644 Binary files a/graphics/pokemon/houndour/footprint.png and b/graphics/pokemon/houndour/footprint.png differ diff --git a/graphics/pokemon/huntail/footprint.png b/graphics/pokemon/huntail/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/huntail/footprint.png and b/graphics/pokemon/huntail/footprint.png differ diff --git a/graphics/pokemon/hydreigon/footprint.png b/graphics/pokemon/hydreigon/footprint.png index 694b0c1b7..2449369fd 100644 Binary files a/graphics/pokemon/hydreigon/footprint.png and b/graphics/pokemon/hydreigon/footprint.png differ diff --git a/graphics/pokemon/hypno/footprint.png b/graphics/pokemon/hypno/footprint.png index 51f734973..173db7238 100644 Binary files a/graphics/pokemon/hypno/footprint.png and b/graphics/pokemon/hypno/footprint.png differ diff --git a/graphics/pokemon/igglybuff/footprint.png b/graphics/pokemon/igglybuff/footprint.png index bbb7352a6..d24c1760d 100644 Binary files a/graphics/pokemon/igglybuff/footprint.png and b/graphics/pokemon/igglybuff/footprint.png differ diff --git a/graphics/pokemon/illumise/footprint.png b/graphics/pokemon/illumise/footprint.png index 451d532b2..d39b4f005 100644 Binary files a/graphics/pokemon/illumise/footprint.png and b/graphics/pokemon/illumise/footprint.png differ diff --git a/graphics/pokemon/impidimp/footprint.png b/graphics/pokemon/impidimp/footprint.png index 8ff5f9113..5d01e97d6 100644 Binary files a/graphics/pokemon/impidimp/footprint.png and b/graphics/pokemon/impidimp/footprint.png differ diff --git a/graphics/pokemon/incineroar/footprint.png b/graphics/pokemon/incineroar/footprint.png index 269a337d6..7e40d8198 100644 Binary files a/graphics/pokemon/incineroar/footprint.png and b/graphics/pokemon/incineroar/footprint.png differ diff --git a/graphics/pokemon/indeedee/footprint.png b/graphics/pokemon/indeedee/footprint.png index d406d05d9..b02522c6e 100644 Binary files a/graphics/pokemon/indeedee/footprint.png and b/graphics/pokemon/indeedee/footprint.png differ diff --git a/graphics/pokemon/infernape/footprint.png b/graphics/pokemon/infernape/footprint.png index 9465afb87..b0e3b2577 100644 Binary files a/graphics/pokemon/infernape/footprint.png and b/graphics/pokemon/infernape/footprint.png differ diff --git a/graphics/pokemon/inkay/footprint.png b/graphics/pokemon/inkay/footprint.png index 479353ffc..2449369fd 100644 Binary files a/graphics/pokemon/inkay/footprint.png and b/graphics/pokemon/inkay/footprint.png differ diff --git a/graphics/pokemon/inteleon/footprint.png b/graphics/pokemon/inteleon/footprint.png index 7ea7d445f..fa14226f7 100644 Binary files a/graphics/pokemon/inteleon/footprint.png and b/graphics/pokemon/inteleon/footprint.png differ diff --git a/graphics/pokemon/ivysaur/footprint.png b/graphics/pokemon/ivysaur/footprint.png index 29206b935..d837294f9 100644 Binary files a/graphics/pokemon/ivysaur/footprint.png and b/graphics/pokemon/ivysaur/footprint.png differ diff --git a/graphics/pokemon/jangmo_o/footprint.png b/graphics/pokemon/jangmo_o/footprint.png index 87c5900eb..9f0bcbdd9 100644 Binary files a/graphics/pokemon/jangmo_o/footprint.png and b/graphics/pokemon/jangmo_o/footprint.png differ diff --git a/graphics/pokemon/jellicent/footprint.png b/graphics/pokemon/jellicent/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/jellicent/footprint.png and b/graphics/pokemon/jellicent/footprint.png differ diff --git a/graphics/pokemon/jigglypuff/footprint.png b/graphics/pokemon/jigglypuff/footprint.png index 59b5f1171..b6d981b10 100644 Binary files a/graphics/pokemon/jigglypuff/footprint.png and b/graphics/pokemon/jigglypuff/footprint.png differ diff --git a/graphics/pokemon/jirachi/footprint.png b/graphics/pokemon/jirachi/footprint.png index 856bb5faa..1153c76df 100644 Binary files a/graphics/pokemon/jirachi/footprint.png and b/graphics/pokemon/jirachi/footprint.png differ diff --git a/graphics/pokemon/jolteon/footprint.png b/graphics/pokemon/jolteon/footprint.png index d1e9477b3..450c3c495 100644 Binary files a/graphics/pokemon/jolteon/footprint.png and b/graphics/pokemon/jolteon/footprint.png differ diff --git a/graphics/pokemon/joltik/footprint.png b/graphics/pokemon/joltik/footprint.png index fdd7cd4d3..2a1c1f3dd 100644 Binary files a/graphics/pokemon/joltik/footprint.png and b/graphics/pokemon/joltik/footprint.png differ diff --git a/graphics/pokemon/jumpluff/footprint.png b/graphics/pokemon/jumpluff/footprint.png index 9cd0f5938..5d01e97d6 100644 Binary files a/graphics/pokemon/jumpluff/footprint.png and b/graphics/pokemon/jumpluff/footprint.png differ diff --git a/graphics/pokemon/jynx/footprint.png b/graphics/pokemon/jynx/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/jynx/footprint.png and b/graphics/pokemon/jynx/footprint.png differ diff --git a/graphics/pokemon/kabuto/footprint.png b/graphics/pokemon/kabuto/footprint.png index 6965dbe60..a9b0e33c2 100644 Binary files a/graphics/pokemon/kabuto/footprint.png and b/graphics/pokemon/kabuto/footprint.png differ diff --git a/graphics/pokemon/kabutops/footprint.png b/graphics/pokemon/kabutops/footprint.png index 127b741d8..54f193c50 100644 Binary files a/graphics/pokemon/kabutops/footprint.png and b/graphics/pokemon/kabutops/footprint.png differ diff --git a/graphics/pokemon/kadabra/footprint.png b/graphics/pokemon/kadabra/footprint.png index a699f2987..8cbac4edd 100644 Binary files a/graphics/pokemon/kadabra/footprint.png and b/graphics/pokemon/kadabra/footprint.png differ diff --git a/graphics/pokemon/kakuna/footprint.png b/graphics/pokemon/kakuna/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/kakuna/footprint.png and b/graphics/pokemon/kakuna/footprint.png differ diff --git a/graphics/pokemon/kangaskhan/footprint.png b/graphics/pokemon/kangaskhan/footprint.png index 7753a4a71..05b12acf9 100644 Binary files a/graphics/pokemon/kangaskhan/footprint.png and b/graphics/pokemon/kangaskhan/footprint.png differ diff --git a/graphics/pokemon/karrablast/footprint.png b/graphics/pokemon/karrablast/footprint.png index bc2765e42..b15fbf9ea 100644 Binary files a/graphics/pokemon/karrablast/footprint.png and b/graphics/pokemon/karrablast/footprint.png differ diff --git a/graphics/pokemon/kartana/footprint.png b/graphics/pokemon/kartana/footprint.png index 9910a09ec..2449369fd 100644 Binary files a/graphics/pokemon/kartana/footprint.png and b/graphics/pokemon/kartana/footprint.png differ diff --git a/graphics/pokemon/kecleon/footprint.png b/graphics/pokemon/kecleon/footprint.png index 3c6968437..986c726fa 100644 Binary files a/graphics/pokemon/kecleon/footprint.png and b/graphics/pokemon/kecleon/footprint.png differ diff --git a/graphics/pokemon/keldeo/footprint.png b/graphics/pokemon/keldeo/footprint.png index 3148e719b..8c0eec06e 100644 Binary files a/graphics/pokemon/keldeo/footprint.png and b/graphics/pokemon/keldeo/footprint.png differ diff --git a/graphics/pokemon/kingdra/footprint.png b/graphics/pokemon/kingdra/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/kingdra/footprint.png and b/graphics/pokemon/kingdra/footprint.png differ diff --git a/graphics/pokemon/kingler/footprint.png b/graphics/pokemon/kingler/footprint.png index b75db30dc..d1db4154e 100644 Binary files a/graphics/pokemon/kingler/footprint.png and b/graphics/pokemon/kingler/footprint.png differ diff --git a/graphics/pokemon/kirlia/footprint.png b/graphics/pokemon/kirlia/footprint.png index c1c0058e7..2a1c1f3dd 100644 Binary files a/graphics/pokemon/kirlia/footprint.png and b/graphics/pokemon/kirlia/footprint.png differ diff --git a/graphics/pokemon/klang/footprint.png b/graphics/pokemon/klang/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/klang/footprint.png and b/graphics/pokemon/klang/footprint.png differ diff --git a/graphics/pokemon/klefki/footprint.png b/graphics/pokemon/klefki/footprint.png index b0616c0ff..2449369fd 100644 Binary files a/graphics/pokemon/klefki/footprint.png and b/graphics/pokemon/klefki/footprint.png differ diff --git a/graphics/pokemon/klink/footprint.png b/graphics/pokemon/klink/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/klink/footprint.png and b/graphics/pokemon/klink/footprint.png differ diff --git a/graphics/pokemon/klinklang/footprint.png b/graphics/pokemon/klinklang/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/klinklang/footprint.png and b/graphics/pokemon/klinklang/footprint.png differ diff --git a/graphics/pokemon/koffing/footprint.png b/graphics/pokemon/koffing/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/koffing/footprint.png and b/graphics/pokemon/koffing/footprint.png differ diff --git a/graphics/pokemon/komala/footprint.png b/graphics/pokemon/komala/footprint.png index 6c8921c31..fb5f9743e 100644 Binary files a/graphics/pokemon/komala/footprint.png and b/graphics/pokemon/komala/footprint.png differ diff --git a/graphics/pokemon/kommo_o/footprint.png b/graphics/pokemon/kommo_o/footprint.png index 4f14bd482..917f42197 100644 Binary files a/graphics/pokemon/kommo_o/footprint.png and b/graphics/pokemon/kommo_o/footprint.png differ diff --git a/graphics/pokemon/krabby/footprint.png b/graphics/pokemon/krabby/footprint.png index eae28fe5e..1b70f1bdf 100644 Binary files a/graphics/pokemon/krabby/footprint.png and b/graphics/pokemon/krabby/footprint.png differ diff --git a/graphics/pokemon/kricketot/footprint.png b/graphics/pokemon/kricketot/footprint.png index 503a7a1ee..7a76910d9 100644 Binary files a/graphics/pokemon/kricketot/footprint.png and b/graphics/pokemon/kricketot/footprint.png differ diff --git a/graphics/pokemon/kricketune/footprint.png b/graphics/pokemon/kricketune/footprint.png index 6ab75a826..a9b0e33c2 100644 Binary files a/graphics/pokemon/kricketune/footprint.png and b/graphics/pokemon/kricketune/footprint.png differ diff --git a/graphics/pokemon/krokorok/footprint.png b/graphics/pokemon/krokorok/footprint.png index 58af3f083..e9296356f 100644 Binary files a/graphics/pokemon/krokorok/footprint.png and b/graphics/pokemon/krokorok/footprint.png differ diff --git a/graphics/pokemon/krookodile/footprint.png b/graphics/pokemon/krookodile/footprint.png index 1a68d923a..abd3e30a2 100644 Binary files a/graphics/pokemon/krookodile/footprint.png and b/graphics/pokemon/krookodile/footprint.png differ diff --git a/graphics/pokemon/kubfu/footprint.png b/graphics/pokemon/kubfu/footprint.png index cb372f7d2..9576d0bf5 100644 Binary files a/graphics/pokemon/kubfu/footprint.png and b/graphics/pokemon/kubfu/footprint.png differ diff --git a/graphics/pokemon/kyogre/footprint.png b/graphics/pokemon/kyogre/footprint.png index 8d58ee462..de1ea4d0d 100644 Binary files a/graphics/pokemon/kyogre/footprint.png and b/graphics/pokemon/kyogre/footprint.png differ diff --git a/graphics/pokemon/kyurem/footprint.png b/graphics/pokemon/kyurem/footprint.png index 7a23f0d13..b63fed15b 100644 Binary files a/graphics/pokemon/kyurem/footprint.png and b/graphics/pokemon/kyurem/footprint.png differ diff --git a/graphics/pokemon/lairon/footprint.png b/graphics/pokemon/lairon/footprint.png index 9a6527c1c..e465f42d5 100644 Binary files a/graphics/pokemon/lairon/footprint.png and b/graphics/pokemon/lairon/footprint.png differ diff --git a/graphics/pokemon/lampent/footprint.png b/graphics/pokemon/lampent/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/lampent/footprint.png and b/graphics/pokemon/lampent/footprint.png differ diff --git a/graphics/pokemon/landorus/footprint.png b/graphics/pokemon/landorus/footprint.png index 694b0c1b7..2449369fd 100644 Binary files a/graphics/pokemon/landorus/footprint.png and b/graphics/pokemon/landorus/footprint.png differ diff --git a/graphics/pokemon/lanturn/footprint.png b/graphics/pokemon/lanturn/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/lanturn/footprint.png and b/graphics/pokemon/lanturn/footprint.png differ diff --git a/graphics/pokemon/lapras/footprint.png b/graphics/pokemon/lapras/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/lapras/footprint.png and b/graphics/pokemon/lapras/footprint.png differ diff --git a/graphics/pokemon/larvesta/footprint.png b/graphics/pokemon/larvesta/footprint.png index d6264f26b..2a1c1f3dd 100644 Binary files a/graphics/pokemon/larvesta/footprint.png and b/graphics/pokemon/larvesta/footprint.png differ diff --git a/graphics/pokemon/larvitar/footprint.png b/graphics/pokemon/larvitar/footprint.png index a31e8d7f3..52d2eaab9 100644 Binary files a/graphics/pokemon/larvitar/footprint.png and b/graphics/pokemon/larvitar/footprint.png differ diff --git a/graphics/pokemon/latias/footprint.png b/graphics/pokemon/latias/footprint.png index 0419630c1..f0f34c500 100644 Binary files a/graphics/pokemon/latias/footprint.png and b/graphics/pokemon/latias/footprint.png differ diff --git a/graphics/pokemon/latios/footprint.png b/graphics/pokemon/latios/footprint.png index f77d0fa86..7c22956b6 100644 Binary files a/graphics/pokemon/latios/footprint.png and b/graphics/pokemon/latios/footprint.png differ diff --git a/graphics/pokemon/leafeon/footprint.png b/graphics/pokemon/leafeon/footprint.png index d176ea9fd..43b2a5a65 100644 Binary files a/graphics/pokemon/leafeon/footprint.png and b/graphics/pokemon/leafeon/footprint.png differ diff --git a/graphics/pokemon/leavanny/footprint.png b/graphics/pokemon/leavanny/footprint.png index c4fdc5673..a9b0e33c2 100644 Binary files a/graphics/pokemon/leavanny/footprint.png and b/graphics/pokemon/leavanny/footprint.png differ diff --git a/graphics/pokemon/ledian/footprint.png b/graphics/pokemon/ledian/footprint.png index 5c2d6221f..640bea34c 100644 Binary files a/graphics/pokemon/ledian/footprint.png and b/graphics/pokemon/ledian/footprint.png differ diff --git a/graphics/pokemon/ledyba/footprint.png b/graphics/pokemon/ledyba/footprint.png index a52ed2560..1ec169c42 100644 Binary files a/graphics/pokemon/ledyba/footprint.png and b/graphics/pokemon/ledyba/footprint.png differ diff --git a/graphics/pokemon/lickilicky/footprint.png b/graphics/pokemon/lickilicky/footprint.png index d1fbb2f9d..f95bb0b18 100644 Binary files a/graphics/pokemon/lickilicky/footprint.png and b/graphics/pokemon/lickilicky/footprint.png differ diff --git a/graphics/pokemon/lickitung/footprint.png b/graphics/pokemon/lickitung/footprint.png index 1f88f23fc..fb9200103 100644 Binary files a/graphics/pokemon/lickitung/footprint.png and b/graphics/pokemon/lickitung/footprint.png differ diff --git a/graphics/pokemon/liepard/footprint.png b/graphics/pokemon/liepard/footprint.png index 47f7eaee4..7c0499f09 100644 Binary files a/graphics/pokemon/liepard/footprint.png and b/graphics/pokemon/liepard/footprint.png differ diff --git a/graphics/pokemon/lileep/footprint.png b/graphics/pokemon/lileep/footprint.png index ce6b2790e..ee6885304 100644 Binary files a/graphics/pokemon/lileep/footprint.png and b/graphics/pokemon/lileep/footprint.png differ diff --git a/graphics/pokemon/lilligant/footprint.png b/graphics/pokemon/lilligant/footprint.png index 30a2d5fd2..cd8a8d590 100644 Binary files a/graphics/pokemon/lilligant/footprint.png and b/graphics/pokemon/lilligant/footprint.png differ diff --git a/graphics/pokemon/lillipup/footprint.png b/graphics/pokemon/lillipup/footprint.png index 56f7c151a..6b1148350 100644 Binary files a/graphics/pokemon/lillipup/footprint.png and b/graphics/pokemon/lillipup/footprint.png differ diff --git a/graphics/pokemon/linoone/footprint.png b/graphics/pokemon/linoone/footprint.png index 8d83166d3..ff6019b7b 100644 Binary files a/graphics/pokemon/linoone/footprint.png and b/graphics/pokemon/linoone/footprint.png differ diff --git a/graphics/pokemon/litleo/footprint.png b/graphics/pokemon/litleo/footprint.png index 586e858ad..3660eb4fd 100644 Binary files a/graphics/pokemon/litleo/footprint.png and b/graphics/pokemon/litleo/footprint.png differ diff --git a/graphics/pokemon/litten/footprint.png b/graphics/pokemon/litten/footprint.png index 8c7c5b067..ca1472dc8 100644 Binary files a/graphics/pokemon/litten/footprint.png and b/graphics/pokemon/litten/footprint.png differ diff --git a/graphics/pokemon/litwick/footprint.png b/graphics/pokemon/litwick/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/litwick/footprint.png and b/graphics/pokemon/litwick/footprint.png differ diff --git a/graphics/pokemon/lombre/footprint.png b/graphics/pokemon/lombre/footprint.png index 051e5ab55..333b1c7b4 100644 Binary files a/graphics/pokemon/lombre/footprint.png and b/graphics/pokemon/lombre/footprint.png differ diff --git a/graphics/pokemon/lopunny/footprint.png b/graphics/pokemon/lopunny/footprint.png index 3fbbfd61d..71ca6189d 100644 Binary files a/graphics/pokemon/lopunny/footprint.png and b/graphics/pokemon/lopunny/footprint.png differ diff --git a/graphics/pokemon/lotad/footprint.png b/graphics/pokemon/lotad/footprint.png index caac6945f..1e075c103 100644 Binary files a/graphics/pokemon/lotad/footprint.png and b/graphics/pokemon/lotad/footprint.png differ diff --git a/graphics/pokemon/loudred/footprint.png b/graphics/pokemon/loudred/footprint.png index 604af9000..8468d3ea6 100644 Binary files a/graphics/pokemon/loudred/footprint.png and b/graphics/pokemon/loudred/footprint.png differ diff --git a/graphics/pokemon/lucario/footprint.png b/graphics/pokemon/lucario/footprint.png index 1b78e62cf..da160c970 100644 Binary files a/graphics/pokemon/lucario/footprint.png and b/graphics/pokemon/lucario/footprint.png differ diff --git a/graphics/pokemon/ludicolo/footprint.png b/graphics/pokemon/ludicolo/footprint.png index 23163f358..e5aa759ab 100644 Binary files a/graphics/pokemon/ludicolo/footprint.png and b/graphics/pokemon/ludicolo/footprint.png differ diff --git a/graphics/pokemon/lugia/footprint.png b/graphics/pokemon/lugia/footprint.png index e6642ed07..bb807c6dd 100644 Binary files a/graphics/pokemon/lugia/footprint.png and b/graphics/pokemon/lugia/footprint.png differ diff --git a/graphics/pokemon/lumineon/footprint.png b/graphics/pokemon/lumineon/footprint.png index 0a5cb2bb4..2449369fd 100644 Binary files a/graphics/pokemon/lumineon/footprint.png and b/graphics/pokemon/lumineon/footprint.png differ diff --git a/graphics/pokemon/lunala/footprint.png b/graphics/pokemon/lunala/footprint.png index d9a4ff1d4..2449369fd 100644 Binary files a/graphics/pokemon/lunala/footprint.png and b/graphics/pokemon/lunala/footprint.png differ diff --git a/graphics/pokemon/lunatone/footprint.png b/graphics/pokemon/lunatone/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/lunatone/footprint.png and b/graphics/pokemon/lunatone/footprint.png differ diff --git a/graphics/pokemon/lurantis/footprint.png b/graphics/pokemon/lurantis/footprint.png index c6733b612..2a1c1f3dd 100644 Binary files a/graphics/pokemon/lurantis/footprint.png and b/graphics/pokemon/lurantis/footprint.png differ diff --git a/graphics/pokemon/luvdisc/footprint.png b/graphics/pokemon/luvdisc/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/luvdisc/footprint.png and b/graphics/pokemon/luvdisc/footprint.png differ diff --git a/graphics/pokemon/luxio/footprint.png b/graphics/pokemon/luxio/footprint.png index 374556242..17ccb25e9 100644 Binary files a/graphics/pokemon/luxio/footprint.png and b/graphics/pokemon/luxio/footprint.png differ diff --git a/graphics/pokemon/luxray/footprint.png b/graphics/pokemon/luxray/footprint.png index be6f8bb9f..8ce9f9cb4 100644 Binary files a/graphics/pokemon/luxray/footprint.png and b/graphics/pokemon/luxray/footprint.png differ diff --git a/graphics/pokemon/lycanroc/footprint.png b/graphics/pokemon/lycanroc/footprint.png index 7e69bd83e..5257ec3e0 100644 Binary files a/graphics/pokemon/lycanroc/footprint.png and b/graphics/pokemon/lycanroc/footprint.png differ diff --git a/graphics/pokemon/machamp/footprint.png b/graphics/pokemon/machamp/footprint.png index e562fd08c..bfccf5bdb 100644 Binary files a/graphics/pokemon/machamp/footprint.png and b/graphics/pokemon/machamp/footprint.png differ diff --git a/graphics/pokemon/machoke/footprint.png b/graphics/pokemon/machoke/footprint.png index d9009d3e1..5cde0083d 100644 Binary files a/graphics/pokemon/machoke/footprint.png and b/graphics/pokemon/machoke/footprint.png differ diff --git a/graphics/pokemon/machop/footprint.png b/graphics/pokemon/machop/footprint.png index 8b2808553..9bb3ae063 100644 Binary files a/graphics/pokemon/machop/footprint.png and b/graphics/pokemon/machop/footprint.png differ diff --git a/graphics/pokemon/magby/footprint.png b/graphics/pokemon/magby/footprint.png index 655d0ca2b..45e1a343e 100644 Binary files a/graphics/pokemon/magby/footprint.png and b/graphics/pokemon/magby/footprint.png differ diff --git a/graphics/pokemon/magcargo/footprint.png b/graphics/pokemon/magcargo/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/magcargo/footprint.png and b/graphics/pokemon/magcargo/footprint.png differ diff --git a/graphics/pokemon/magearna/footprint.png b/graphics/pokemon/magearna/footprint.png index 0f2f2d308..2a1c1f3dd 100644 Binary files a/graphics/pokemon/magearna/footprint.png and b/graphics/pokemon/magearna/footprint.png differ diff --git a/graphics/pokemon/magikarp/footprint.png b/graphics/pokemon/magikarp/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/magikarp/footprint.png and b/graphics/pokemon/magikarp/footprint.png differ diff --git a/graphics/pokemon/magmar/footprint.png b/graphics/pokemon/magmar/footprint.png index 17de53a46..328f67d2e 100644 Binary files a/graphics/pokemon/magmar/footprint.png and b/graphics/pokemon/magmar/footprint.png differ diff --git a/graphics/pokemon/magmortar/footprint.png b/graphics/pokemon/magmortar/footprint.png index a15ffc7c7..7aa0b82c3 100644 Binary files a/graphics/pokemon/magmortar/footprint.png and b/graphics/pokemon/magmortar/footprint.png differ diff --git a/graphics/pokemon/magnemite/footprint.png b/graphics/pokemon/magnemite/footprint.png index f710e5028..3f8f930cb 100644 Binary files a/graphics/pokemon/magnemite/footprint.png and b/graphics/pokemon/magnemite/footprint.png differ diff --git a/graphics/pokemon/magneton/footprint.png b/graphics/pokemon/magneton/footprint.png index 00b8b0ebf..aa3767577 100644 Binary files a/graphics/pokemon/magneton/footprint.png and b/graphics/pokemon/magneton/footprint.png differ diff --git a/graphics/pokemon/magnezone/footprint.png b/graphics/pokemon/magnezone/footprint.png index 0a5cb2bb4..2449369fd 100644 Binary files a/graphics/pokemon/magnezone/footprint.png and b/graphics/pokemon/magnezone/footprint.png differ diff --git a/graphics/pokemon/makuhita/footprint.png b/graphics/pokemon/makuhita/footprint.png index 3da20ccb3..4f2aca69e 100644 Binary files a/graphics/pokemon/makuhita/footprint.png and b/graphics/pokemon/makuhita/footprint.png differ diff --git a/graphics/pokemon/malamar/footprint.png b/graphics/pokemon/malamar/footprint.png index 9987a2282..45b1e5b75 100644 Binary files a/graphics/pokemon/malamar/footprint.png and b/graphics/pokemon/malamar/footprint.png differ diff --git a/graphics/pokemon/mamoswine/footprint.png b/graphics/pokemon/mamoswine/footprint.png index a593d179a..9d3bd7e33 100644 Binary files a/graphics/pokemon/mamoswine/footprint.png and b/graphics/pokemon/mamoswine/footprint.png differ diff --git a/graphics/pokemon/manaphy/footprint.png b/graphics/pokemon/manaphy/footprint.png index 57a2be0b3..2449369fd 100644 Binary files a/graphics/pokemon/manaphy/footprint.png and b/graphics/pokemon/manaphy/footprint.png differ diff --git a/graphics/pokemon/mandibuzz/footprint.png b/graphics/pokemon/mandibuzz/footprint.png index c029d5794..5a31495e8 100644 Binary files a/graphics/pokemon/mandibuzz/footprint.png and b/graphics/pokemon/mandibuzz/footprint.png differ diff --git a/graphics/pokemon/manectric/footprint.png b/graphics/pokemon/manectric/footprint.png index 4f4903bf9..a3ab1c56c 100644 Binary files a/graphics/pokemon/manectric/footprint.png and b/graphics/pokemon/manectric/footprint.png differ diff --git a/graphics/pokemon/mankey/footprint.png b/graphics/pokemon/mankey/footprint.png index f02036af5..4881d17c3 100644 Binary files a/graphics/pokemon/mankey/footprint.png and b/graphics/pokemon/mankey/footprint.png differ diff --git a/graphics/pokemon/mantine/footprint.png b/graphics/pokemon/mantine/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/mantine/footprint.png and b/graphics/pokemon/mantine/footprint.png differ diff --git a/graphics/pokemon/mantyke/footprint.png b/graphics/pokemon/mantyke/footprint.png index fc1f2f308..2449369fd 100644 Binary files a/graphics/pokemon/mantyke/footprint.png and b/graphics/pokemon/mantyke/footprint.png differ diff --git a/graphics/pokemon/maractus/footprint.png b/graphics/pokemon/maractus/footprint.png index e6ba8642c..65322f267 100644 Binary files a/graphics/pokemon/maractus/footprint.png and b/graphics/pokemon/maractus/footprint.png differ diff --git a/graphics/pokemon/mareanie/footprint.png b/graphics/pokemon/mareanie/footprint.png index b851ca0ca..2449369fd 100644 Binary files a/graphics/pokemon/mareanie/footprint.png and b/graphics/pokemon/mareanie/footprint.png differ diff --git a/graphics/pokemon/mareep/footprint.png b/graphics/pokemon/mareep/footprint.png index 2913a4c48..8e89572b4 100644 Binary files a/graphics/pokemon/mareep/footprint.png and b/graphics/pokemon/mareep/footprint.png differ diff --git a/graphics/pokemon/marill/footprint.png b/graphics/pokemon/marill/footprint.png index a09d8f2c0..f70b3ea55 100644 Binary files a/graphics/pokemon/marill/footprint.png and b/graphics/pokemon/marill/footprint.png differ diff --git a/graphics/pokemon/marowak/footprint.png b/graphics/pokemon/marowak/footprint.png index fbde41d04..e05d5d000 100644 Binary files a/graphics/pokemon/marowak/footprint.png and b/graphics/pokemon/marowak/footprint.png differ diff --git a/graphics/pokemon/marshadow/footprint.png b/graphics/pokemon/marshadow/footprint.png index 6d82d60bb..a52d267bd 100644 Binary files a/graphics/pokemon/marshadow/footprint.png and b/graphics/pokemon/marshadow/footprint.png differ diff --git a/graphics/pokemon/marshtomp/footprint.png b/graphics/pokemon/marshtomp/footprint.png index 3c232ccad..6ea182714 100644 Binary files a/graphics/pokemon/marshtomp/footprint.png and b/graphics/pokemon/marshtomp/footprint.png differ diff --git a/graphics/pokemon/masquerain/footprint.png b/graphics/pokemon/masquerain/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/masquerain/footprint.png and b/graphics/pokemon/masquerain/footprint.png differ diff --git a/graphics/pokemon/medicham/footprint.png b/graphics/pokemon/medicham/footprint.png index 804e8c1d8..da5cdd23b 100644 Binary files a/graphics/pokemon/medicham/footprint.png and b/graphics/pokemon/medicham/footprint.png differ diff --git a/graphics/pokemon/meditite/footprint.png b/graphics/pokemon/meditite/footprint.png index 034cb0df8..4cf72d9ae 100644 Binary files a/graphics/pokemon/meditite/footprint.png and b/graphics/pokemon/meditite/footprint.png differ diff --git a/graphics/pokemon/meganium/footprint.png b/graphics/pokemon/meganium/footprint.png index 39303ac4f..1592e145c 100644 Binary files a/graphics/pokemon/meganium/footprint.png and b/graphics/pokemon/meganium/footprint.png differ diff --git a/graphics/pokemon/melmetal/footprint.png b/graphics/pokemon/melmetal/footprint.png index 982753a19..1c45302d3 100644 Binary files a/graphics/pokemon/melmetal/footprint.png and b/graphics/pokemon/melmetal/footprint.png differ diff --git a/graphics/pokemon/meloetta/footprint.png b/graphics/pokemon/meloetta/footprint.png index 220e4350a..2a1c1f3dd 100644 Binary files a/graphics/pokemon/meloetta/footprint.png and b/graphics/pokemon/meloetta/footprint.png differ diff --git a/graphics/pokemon/meltan/footprint.png b/graphics/pokemon/meltan/footprint.png index 37b4e1d3e..2449369fd 100644 Binary files a/graphics/pokemon/meltan/footprint.png and b/graphics/pokemon/meltan/footprint.png differ diff --git a/graphics/pokemon/meowstic/footprint.png b/graphics/pokemon/meowstic/footprint.png index 7570dd401..a9b0e33c2 100644 Binary files a/graphics/pokemon/meowstic/footprint.png and b/graphics/pokemon/meowstic/footprint.png differ diff --git a/graphics/pokemon/meowth/footprint.png b/graphics/pokemon/meowth/footprint.png index 7dc20ada7..d7283ba43 100644 Binary files a/graphics/pokemon/meowth/footprint.png and b/graphics/pokemon/meowth/footprint.png differ diff --git a/graphics/pokemon/mesprit/footprint.png b/graphics/pokemon/mesprit/footprint.png index 613b898a6..f1b5a7a09 100644 Binary files a/graphics/pokemon/mesprit/footprint.png and b/graphics/pokemon/mesprit/footprint.png differ diff --git a/graphics/pokemon/metagross/footprint.png b/graphics/pokemon/metagross/footprint.png index 07f91d604..fd7039efd 100644 Binary files a/graphics/pokemon/metagross/footprint.png and b/graphics/pokemon/metagross/footprint.png differ diff --git a/graphics/pokemon/metang/footprint.png b/graphics/pokemon/metang/footprint.png index 5b0f8f5b0..a91a3d532 100644 Binary files a/graphics/pokemon/metang/footprint.png and b/graphics/pokemon/metang/footprint.png differ diff --git a/graphics/pokemon/metapod/footprint.png b/graphics/pokemon/metapod/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/metapod/footprint.png and b/graphics/pokemon/metapod/footprint.png differ diff --git a/graphics/pokemon/mew/footprint.png b/graphics/pokemon/mew/footprint.png index afbba43ac..e380642b8 100644 Binary files a/graphics/pokemon/mew/footprint.png and b/graphics/pokemon/mew/footprint.png differ diff --git a/graphics/pokemon/mewtwo/footprint.png b/graphics/pokemon/mewtwo/footprint.png index 0f7573dd3..bedffad65 100644 Binary files a/graphics/pokemon/mewtwo/footprint.png and b/graphics/pokemon/mewtwo/footprint.png differ diff --git a/graphics/pokemon/mienfoo/footprint.png b/graphics/pokemon/mienfoo/footprint.png index 3ed8b350b..90b49038e 100644 Binary files a/graphics/pokemon/mienfoo/footprint.png and b/graphics/pokemon/mienfoo/footprint.png differ diff --git a/graphics/pokemon/mienshao/footprint.png b/graphics/pokemon/mienshao/footprint.png index 2b22b099b..bb731abaa 100644 Binary files a/graphics/pokemon/mienshao/footprint.png and b/graphics/pokemon/mienshao/footprint.png differ diff --git a/graphics/pokemon/mightyena/footprint.png b/graphics/pokemon/mightyena/footprint.png index b39af65bc..f76936435 100644 Binary files a/graphics/pokemon/mightyena/footprint.png and b/graphics/pokemon/mightyena/footprint.png differ diff --git a/graphics/pokemon/milcery/footprint.png b/graphics/pokemon/milcery/footprint.png index fd3ee498d..2449369fd 100644 Binary files a/graphics/pokemon/milcery/footprint.png and b/graphics/pokemon/milcery/footprint.png differ diff --git a/graphics/pokemon/milotic/footprint.png b/graphics/pokemon/milotic/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/milotic/footprint.png and b/graphics/pokemon/milotic/footprint.png differ diff --git a/graphics/pokemon/miltank/footprint.png b/graphics/pokemon/miltank/footprint.png index a7162cd21..4f3d0e696 100644 Binary files a/graphics/pokemon/miltank/footprint.png and b/graphics/pokemon/miltank/footprint.png differ diff --git a/graphics/pokemon/mime_jr/footprint.png b/graphics/pokemon/mime_jr/footprint.png index e4abbcc18..458777ede 100644 Binary files a/graphics/pokemon/mime_jr/footprint.png and b/graphics/pokemon/mime_jr/footprint.png differ diff --git a/graphics/pokemon/mimikyu/footprint.png b/graphics/pokemon/mimikyu/footprint.png index 00eff81a9..2449369fd 100644 Binary files a/graphics/pokemon/mimikyu/footprint.png and b/graphics/pokemon/mimikyu/footprint.png differ diff --git a/graphics/pokemon/minccino/footprint.png b/graphics/pokemon/minccino/footprint.png index 572e5bbf1..58fed7be9 100644 Binary files a/graphics/pokemon/minccino/footprint.png and b/graphics/pokemon/minccino/footprint.png differ diff --git a/graphics/pokemon/minior/footprint.png b/graphics/pokemon/minior/footprint.png index 2e1ee7994..2449369fd 100644 Binary files a/graphics/pokemon/minior/footprint.png and b/graphics/pokemon/minior/footprint.png differ diff --git a/graphics/pokemon/minun/footprint.png b/graphics/pokemon/minun/footprint.png index 1071b8069..3a2365e16 100644 Binary files a/graphics/pokemon/minun/footprint.png and b/graphics/pokemon/minun/footprint.png differ diff --git a/graphics/pokemon/misdreavus/footprint.png b/graphics/pokemon/misdreavus/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/misdreavus/footprint.png and b/graphics/pokemon/misdreavus/footprint.png differ diff --git a/graphics/pokemon/mismagius/footprint.png b/graphics/pokemon/mismagius/footprint.png index 5c72b7dd2..2449369fd 100644 Binary files a/graphics/pokemon/mismagius/footprint.png and b/graphics/pokemon/mismagius/footprint.png differ diff --git a/graphics/pokemon/moltres/footprint.png b/graphics/pokemon/moltres/footprint.png index 3900403bd..6c590ccda 100644 Binary files a/graphics/pokemon/moltres/footprint.png and b/graphics/pokemon/moltres/footprint.png differ diff --git a/graphics/pokemon/monferno/footprint.png b/graphics/pokemon/monferno/footprint.png index a268058ae..04016972c 100644 Binary files a/graphics/pokemon/monferno/footprint.png and b/graphics/pokemon/monferno/footprint.png differ diff --git a/graphics/pokemon/morelull/footprint.png b/graphics/pokemon/morelull/footprint.png index a5658a319..e54ebd437 100644 Binary files a/graphics/pokemon/morelull/footprint.png and b/graphics/pokemon/morelull/footprint.png differ diff --git a/graphics/pokemon/morgrem/footprint.png b/graphics/pokemon/morgrem/footprint.png index 241717ead..92e75f36b 100644 Binary files a/graphics/pokemon/morgrem/footprint.png and b/graphics/pokemon/morgrem/footprint.png differ diff --git a/graphics/pokemon/morpeko/footprint.png b/graphics/pokemon/morpeko/footprint.png index 398d437f0..5d01e97d6 100644 Binary files a/graphics/pokemon/morpeko/footprint.png and b/graphics/pokemon/morpeko/footprint.png differ diff --git a/graphics/pokemon/mothim/footprint.png b/graphics/pokemon/mothim/footprint.png index 4a533b580..a9b0e33c2 100644 Binary files a/graphics/pokemon/mothim/footprint.png and b/graphics/pokemon/mothim/footprint.png differ diff --git a/graphics/pokemon/mr_mime/footprint.png b/graphics/pokemon/mr_mime/footprint.png index cb0aff1a3..6e8b15e7e 100644 Binary files a/graphics/pokemon/mr_mime/footprint.png and b/graphics/pokemon/mr_mime/footprint.png differ diff --git a/graphics/pokemon/mr_rime/footprint.png b/graphics/pokemon/mr_rime/footprint.png index 5b8cc5c93..990fa7960 100644 Binary files a/graphics/pokemon/mr_rime/footprint.png and b/graphics/pokemon/mr_rime/footprint.png differ diff --git a/graphics/pokemon/mudbray/footprint.png b/graphics/pokemon/mudbray/footprint.png index c334a7fac..f48aa9053 100644 Binary files a/graphics/pokemon/mudbray/footprint.png and b/graphics/pokemon/mudbray/footprint.png differ diff --git a/graphics/pokemon/mudkip/footprint.png b/graphics/pokemon/mudkip/footprint.png index 490db6e25..f06163ae0 100644 Binary files a/graphics/pokemon/mudkip/footprint.png and b/graphics/pokemon/mudkip/footprint.png differ diff --git a/graphics/pokemon/mudsdale/footprint.png b/graphics/pokemon/mudsdale/footprint.png index 16a9b40ae..e1ac51592 100644 Binary files a/graphics/pokemon/mudsdale/footprint.png and b/graphics/pokemon/mudsdale/footprint.png differ diff --git a/graphics/pokemon/muk/footprint.png b/graphics/pokemon/muk/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/muk/footprint.png and b/graphics/pokemon/muk/footprint.png differ diff --git a/graphics/pokemon/munchlax/footprint.png b/graphics/pokemon/munchlax/footprint.png index 462e2dac8..ab6416ccd 100644 Binary files a/graphics/pokemon/munchlax/footprint.png and b/graphics/pokemon/munchlax/footprint.png differ diff --git a/graphics/pokemon/munna/footprint.png b/graphics/pokemon/munna/footprint.png index 29f37f3c7..2a1c1f3dd 100644 Binary files a/graphics/pokemon/munna/footprint.png and b/graphics/pokemon/munna/footprint.png differ diff --git a/graphics/pokemon/murkrow/footprint.png b/graphics/pokemon/murkrow/footprint.png index 0f0566834..901413be8 100644 Binary files a/graphics/pokemon/murkrow/footprint.png and b/graphics/pokemon/murkrow/footprint.png differ diff --git a/graphics/pokemon/musharna/footprint.png b/graphics/pokemon/musharna/footprint.png index 29f37f3c7..2a1c1f3dd 100644 Binary files a/graphics/pokemon/musharna/footprint.png and b/graphics/pokemon/musharna/footprint.png differ diff --git a/graphics/pokemon/naganadel/footprint.png b/graphics/pokemon/naganadel/footprint.png index 78250a3d5..2449369fd 100644 Binary files a/graphics/pokemon/naganadel/footprint.png and b/graphics/pokemon/naganadel/footprint.png differ diff --git a/graphics/pokemon/natu/footprint.png b/graphics/pokemon/natu/footprint.png index f17821fc0..348068d1c 100644 Binary files a/graphics/pokemon/natu/footprint.png and b/graphics/pokemon/natu/footprint.png differ diff --git a/graphics/pokemon/necrozma/footprint.png b/graphics/pokemon/necrozma/footprint.png index baad92198..2449369fd 100644 Binary files a/graphics/pokemon/necrozma/footprint.png and b/graphics/pokemon/necrozma/footprint.png differ diff --git a/graphics/pokemon/nickit/footprint.png b/graphics/pokemon/nickit/footprint.png index 480c8f267..ec73b2332 100644 Binary files a/graphics/pokemon/nickit/footprint.png and b/graphics/pokemon/nickit/footprint.png differ diff --git a/graphics/pokemon/nidoking/footprint.png b/graphics/pokemon/nidoking/footprint.png index 577e14f30..c0e6690e1 100644 Binary files a/graphics/pokemon/nidoking/footprint.png and b/graphics/pokemon/nidoking/footprint.png differ diff --git a/graphics/pokemon/nidoqueen/footprint.png b/graphics/pokemon/nidoqueen/footprint.png index c3156e621..a5b255592 100644 Binary files a/graphics/pokemon/nidoqueen/footprint.png and b/graphics/pokemon/nidoqueen/footprint.png differ diff --git a/graphics/pokemon/nidoran_f/footprint.png b/graphics/pokemon/nidoran_f/footprint.png index f673df112..d0111077b 100644 Binary files a/graphics/pokemon/nidoran_f/footprint.png and b/graphics/pokemon/nidoran_f/footprint.png differ diff --git a/graphics/pokemon/nidoran_m/footprint.png b/graphics/pokemon/nidoran_m/footprint.png index 874c60781..a6b3e3b4a 100644 Binary files a/graphics/pokemon/nidoran_m/footprint.png and b/graphics/pokemon/nidoran_m/footprint.png differ diff --git a/graphics/pokemon/nidorina/footprint.png b/graphics/pokemon/nidorina/footprint.png index 94553054a..922ef8dbd 100644 Binary files a/graphics/pokemon/nidorina/footprint.png and b/graphics/pokemon/nidorina/footprint.png differ diff --git a/graphics/pokemon/nidorino/footprint.png b/graphics/pokemon/nidorino/footprint.png index eaa67b379..9ab80e766 100644 Binary files a/graphics/pokemon/nidorino/footprint.png and b/graphics/pokemon/nidorino/footprint.png differ diff --git a/graphics/pokemon/nihilego/footprint.png b/graphics/pokemon/nihilego/footprint.png index 09c582c42..2449369fd 100644 Binary files a/graphics/pokemon/nihilego/footprint.png and b/graphics/pokemon/nihilego/footprint.png differ diff --git a/graphics/pokemon/nincada/footprint.png b/graphics/pokemon/nincada/footprint.png index deea05721..69d2b0491 100644 Binary files a/graphics/pokemon/nincada/footprint.png and b/graphics/pokemon/nincada/footprint.png differ diff --git a/graphics/pokemon/ninetales/footprint.png b/graphics/pokemon/ninetales/footprint.png index 3f1f0247e..51eb9f83b 100644 Binary files a/graphics/pokemon/ninetales/footprint.png and b/graphics/pokemon/ninetales/footprint.png differ diff --git a/graphics/pokemon/ninjask/footprint.png b/graphics/pokemon/ninjask/footprint.png index eacba16dc..f582fcc05 100644 Binary files a/graphics/pokemon/ninjask/footprint.png and b/graphics/pokemon/ninjask/footprint.png differ diff --git a/graphics/pokemon/noctowl/footprint.png b/graphics/pokemon/noctowl/footprint.png index 89ed409e9..0386b465a 100644 Binary files a/graphics/pokemon/noctowl/footprint.png and b/graphics/pokemon/noctowl/footprint.png differ diff --git a/graphics/pokemon/noibat/footprint.png b/graphics/pokemon/noibat/footprint.png index f89c16499..5abe864e7 100644 Binary files a/graphics/pokemon/noibat/footprint.png and b/graphics/pokemon/noibat/footprint.png differ diff --git a/graphics/pokemon/noivern/footprint.png b/graphics/pokemon/noivern/footprint.png index f83fb1d3e..f579ea94c 100644 Binary files a/graphics/pokemon/noivern/footprint.png and b/graphics/pokemon/noivern/footprint.png differ diff --git a/graphics/pokemon/nosepass/footprint.png b/graphics/pokemon/nosepass/footprint.png index 9b9ad2708..ad8673add 100644 Binary files a/graphics/pokemon/nosepass/footprint.png and b/graphics/pokemon/nosepass/footprint.png differ diff --git a/graphics/pokemon/numel/footprint.png b/graphics/pokemon/numel/footprint.png index 6238f9400..f01ad1592 100644 Binary files a/graphics/pokemon/numel/footprint.png and b/graphics/pokemon/numel/footprint.png differ diff --git a/graphics/pokemon/nuzleaf/footprint.png b/graphics/pokemon/nuzleaf/footprint.png index b35288e05..bd9be6170 100644 Binary files a/graphics/pokemon/nuzleaf/footprint.png and b/graphics/pokemon/nuzleaf/footprint.png differ diff --git a/graphics/pokemon/obstagoon/footprint.png b/graphics/pokemon/obstagoon/footprint.png index dbfcda463..914d309c7 100644 Binary files a/graphics/pokemon/obstagoon/footprint.png and b/graphics/pokemon/obstagoon/footprint.png differ diff --git a/graphics/pokemon/octillery/footprint.png b/graphics/pokemon/octillery/footprint.png index afa1f5433..2306c5b0b 100644 Binary files a/graphics/pokemon/octillery/footprint.png and b/graphics/pokemon/octillery/footprint.png differ diff --git a/graphics/pokemon/oddish/footprint.png b/graphics/pokemon/oddish/footprint.png index d38175273..e5c7eed22 100644 Binary files a/graphics/pokemon/oddish/footprint.png and b/graphics/pokemon/oddish/footprint.png differ diff --git a/graphics/pokemon/omanyte/footprint.png b/graphics/pokemon/omanyte/footprint.png index f5eb9fdba..ec2dde19c 100644 Binary files a/graphics/pokemon/omanyte/footprint.png and b/graphics/pokemon/omanyte/footprint.png differ diff --git a/graphics/pokemon/omastar/footprint.png b/graphics/pokemon/omastar/footprint.png index fdd911ecf..e587f4503 100644 Binary files a/graphics/pokemon/omastar/footprint.png and b/graphics/pokemon/omastar/footprint.png differ diff --git a/graphics/pokemon/onix/footprint.png b/graphics/pokemon/onix/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/onix/footprint.png and b/graphics/pokemon/onix/footprint.png differ diff --git a/graphics/pokemon/oranguru/footprint.png b/graphics/pokemon/oranguru/footprint.png index 294a56389..30c807de4 100644 Binary files a/graphics/pokemon/oranguru/footprint.png and b/graphics/pokemon/oranguru/footprint.png differ diff --git a/graphics/pokemon/orbeetle/footprint.png b/graphics/pokemon/orbeetle/footprint.png index 57dc260a9..475d5235a 100644 Binary files a/graphics/pokemon/orbeetle/footprint.png and b/graphics/pokemon/orbeetle/footprint.png differ diff --git a/graphics/pokemon/oricorio/footprint.png b/graphics/pokemon/oricorio/footprint.png index bb9cc0114..ef4ad1a91 100644 Binary files a/graphics/pokemon/oricorio/footprint.png and b/graphics/pokemon/oricorio/footprint.png differ diff --git a/graphics/pokemon/oshawott/footprint.png b/graphics/pokemon/oshawott/footprint.png index ec6a9341e..d96ed0e2b 100644 Binary files a/graphics/pokemon/oshawott/footprint.png and b/graphics/pokemon/oshawott/footprint.png differ diff --git a/graphics/pokemon/pachirisu/footprint.png b/graphics/pokemon/pachirisu/footprint.png index 3edc42ff3..2e51e1df7 100644 Binary files a/graphics/pokemon/pachirisu/footprint.png and b/graphics/pokemon/pachirisu/footprint.png differ diff --git a/graphics/pokemon/palkia/footprint.png b/graphics/pokemon/palkia/footprint.png index 9a96e5769..4d5030e1f 100644 Binary files a/graphics/pokemon/palkia/footprint.png and b/graphics/pokemon/palkia/footprint.png differ diff --git a/graphics/pokemon/palossand/footprint.png b/graphics/pokemon/palossand/footprint.png index f0c03ad35..2449369fd 100644 Binary files a/graphics/pokemon/palossand/footprint.png and b/graphics/pokemon/palossand/footprint.png differ diff --git a/graphics/pokemon/palpitoad/footprint.png b/graphics/pokemon/palpitoad/footprint.png index 7d8bf2a81..9a95c0a57 100644 Binary files a/graphics/pokemon/palpitoad/footprint.png and b/graphics/pokemon/palpitoad/footprint.png differ diff --git a/graphics/pokemon/pancham/footprint.png b/graphics/pokemon/pancham/footprint.png index afb5d279d..6df5cc7b3 100644 Binary files a/graphics/pokemon/pancham/footprint.png and b/graphics/pokemon/pancham/footprint.png differ diff --git a/graphics/pokemon/pangoro/footprint.png b/graphics/pokemon/pangoro/footprint.png index ddc474878..97297536b 100644 Binary files a/graphics/pokemon/pangoro/footprint.png and b/graphics/pokemon/pangoro/footprint.png differ diff --git a/graphics/pokemon/panpour/footprint.png b/graphics/pokemon/panpour/footprint.png index 0291825c9..9a064a0ce 100644 Binary files a/graphics/pokemon/panpour/footprint.png and b/graphics/pokemon/panpour/footprint.png differ diff --git a/graphics/pokemon/pansage/footprint.png b/graphics/pokemon/pansage/footprint.png index fa4b5d56a..9a064a0ce 100644 Binary files a/graphics/pokemon/pansage/footprint.png and b/graphics/pokemon/pansage/footprint.png differ diff --git a/graphics/pokemon/pansear/footprint.png b/graphics/pokemon/pansear/footprint.png index 0291825c9..9a064a0ce 100644 Binary files a/graphics/pokemon/pansear/footprint.png and b/graphics/pokemon/pansear/footprint.png differ diff --git a/graphics/pokemon/paras/footprint.png b/graphics/pokemon/paras/footprint.png index f8d7574d2..01abc74f1 100644 Binary files a/graphics/pokemon/paras/footprint.png and b/graphics/pokemon/paras/footprint.png differ diff --git a/graphics/pokemon/parasect/footprint.png b/graphics/pokemon/parasect/footprint.png index e0f1715f2..ed9221ade 100644 Binary files a/graphics/pokemon/parasect/footprint.png and b/graphics/pokemon/parasect/footprint.png differ diff --git a/graphics/pokemon/passimian/footprint.png b/graphics/pokemon/passimian/footprint.png index efd96aa10..916c2e1c1 100644 Binary files a/graphics/pokemon/passimian/footprint.png and b/graphics/pokemon/passimian/footprint.png differ diff --git a/graphics/pokemon/patrat/footprint.png b/graphics/pokemon/patrat/footprint.png index 7a16633e6..029b00e95 100644 Binary files a/graphics/pokemon/patrat/footprint.png and b/graphics/pokemon/patrat/footprint.png differ diff --git a/graphics/pokemon/pawniard/footprint.png b/graphics/pokemon/pawniard/footprint.png index 76dfefdf2..702a14a5a 100644 Binary files a/graphics/pokemon/pawniard/footprint.png and b/graphics/pokemon/pawniard/footprint.png differ diff --git a/graphics/pokemon/pelipper/footprint.png b/graphics/pokemon/pelipper/footprint.png index 54718d259..bfb9703f5 100644 Binary files a/graphics/pokemon/pelipper/footprint.png and b/graphics/pokemon/pelipper/footprint.png differ diff --git a/graphics/pokemon/perrserker/footprint.png b/graphics/pokemon/perrserker/footprint.png index c2bce6fde..28b958969 100644 Binary files a/graphics/pokemon/perrserker/footprint.png and b/graphics/pokemon/perrserker/footprint.png differ diff --git a/graphics/pokemon/persian/footprint.png b/graphics/pokemon/persian/footprint.png index 33f25f0aa..99a567fc1 100644 Binary files a/graphics/pokemon/persian/footprint.png and b/graphics/pokemon/persian/footprint.png differ diff --git a/graphics/pokemon/petilil/footprint.png b/graphics/pokemon/petilil/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/petilil/footprint.png and b/graphics/pokemon/petilil/footprint.png differ diff --git a/graphics/pokemon/phanpy/footprint.png b/graphics/pokemon/phanpy/footprint.png index 70498b18f..61eb3ebac 100644 Binary files a/graphics/pokemon/phanpy/footprint.png and b/graphics/pokemon/phanpy/footprint.png differ diff --git a/graphics/pokemon/phantump/footprint.png b/graphics/pokemon/phantump/footprint.png index bd256edcd..2449369fd 100644 Binary files a/graphics/pokemon/phantump/footprint.png and b/graphics/pokemon/phantump/footprint.png differ diff --git a/graphics/pokemon/pheromosa/footprint.png b/graphics/pokemon/pheromosa/footprint.png index b1a57f94e..ac32e7649 100644 Binary files a/graphics/pokemon/pheromosa/footprint.png and b/graphics/pokemon/pheromosa/footprint.png differ diff --git a/graphics/pokemon/phione/footprint.png b/graphics/pokemon/phione/footprint.png index 83d5b970e..2449369fd 100644 Binary files a/graphics/pokemon/phione/footprint.png and b/graphics/pokemon/phione/footprint.png differ diff --git a/graphics/pokemon/pichu/footprint.png b/graphics/pokemon/pichu/footprint.png index 823c7e32d..62d824504 100644 Binary files a/graphics/pokemon/pichu/footprint.png and b/graphics/pokemon/pichu/footprint.png differ diff --git a/graphics/pokemon/pidgeot/footprint.png b/graphics/pokemon/pidgeot/footprint.png index 025341554..ef4ad1a91 100644 Binary files a/graphics/pokemon/pidgeot/footprint.png and b/graphics/pokemon/pidgeot/footprint.png differ diff --git a/graphics/pokemon/pidgeotto/footprint.png b/graphics/pokemon/pidgeotto/footprint.png index c507f72b8..8d9cd78e0 100644 Binary files a/graphics/pokemon/pidgeotto/footprint.png and b/graphics/pokemon/pidgeotto/footprint.png differ diff --git a/graphics/pokemon/pidgey/footprint.png b/graphics/pokemon/pidgey/footprint.png index 6fe6e4282..3422576be 100644 Binary files a/graphics/pokemon/pidgey/footprint.png and b/graphics/pokemon/pidgey/footprint.png differ diff --git a/graphics/pokemon/pidove/footprint.png b/graphics/pokemon/pidove/footprint.png index d4bb5a283..d3fd3bec8 100644 Binary files a/graphics/pokemon/pidove/footprint.png and b/graphics/pokemon/pidove/footprint.png differ diff --git a/graphics/pokemon/pignite/footprint.png b/graphics/pokemon/pignite/footprint.png index 3d1a0e608..d54116d77 100644 Binary files a/graphics/pokemon/pignite/footprint.png and b/graphics/pokemon/pignite/footprint.png differ diff --git a/graphics/pokemon/pikachu/footprint.png b/graphics/pokemon/pikachu/footprint.png index a8ee2e4ac..9145eff5b 100644 Binary files a/graphics/pokemon/pikachu/footprint.png and b/graphics/pokemon/pikachu/footprint.png differ diff --git a/graphics/pokemon/pikipek/footprint.png b/graphics/pokemon/pikipek/footprint.png index 88ac9663c..f4480a412 100644 Binary files a/graphics/pokemon/pikipek/footprint.png and b/graphics/pokemon/pikipek/footprint.png differ diff --git a/graphics/pokemon/piloswine/footprint.png b/graphics/pokemon/piloswine/footprint.png index 0b7405ece..122f3e352 100644 Binary files a/graphics/pokemon/piloswine/footprint.png and b/graphics/pokemon/piloswine/footprint.png differ diff --git a/graphics/pokemon/pincurchin/footprint.png b/graphics/pokemon/pincurchin/footprint.png index 7a29a3a01..a9b0e33c2 100644 Binary files a/graphics/pokemon/pincurchin/footprint.png and b/graphics/pokemon/pincurchin/footprint.png differ diff --git a/graphics/pokemon/pineco/footprint.png b/graphics/pokemon/pineco/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/pineco/footprint.png and b/graphics/pokemon/pineco/footprint.png differ diff --git a/graphics/pokemon/pinsir/footprint.png b/graphics/pokemon/pinsir/footprint.png index ebd22101e..58c654063 100644 Binary files a/graphics/pokemon/pinsir/footprint.png and b/graphics/pokemon/pinsir/footprint.png differ diff --git a/graphics/pokemon/piplup/footprint.png b/graphics/pokemon/piplup/footprint.png index c65cd18c7..8471dc553 100644 Binary files a/graphics/pokemon/piplup/footprint.png and b/graphics/pokemon/piplup/footprint.png differ diff --git a/graphics/pokemon/plusle/footprint.png b/graphics/pokemon/plusle/footprint.png index 1071b8069..3a2365e16 100644 Binary files a/graphics/pokemon/plusle/footprint.png and b/graphics/pokemon/plusle/footprint.png differ diff --git a/graphics/pokemon/poipole/footprint.png b/graphics/pokemon/poipole/footprint.png index 249c47e08..2a1c1f3dd 100644 Binary files a/graphics/pokemon/poipole/footprint.png and b/graphics/pokemon/poipole/footprint.png differ diff --git a/graphics/pokemon/politoed/footprint.png b/graphics/pokemon/politoed/footprint.png index f97b78994..9499c60ec 100644 Binary files a/graphics/pokemon/politoed/footprint.png and b/graphics/pokemon/politoed/footprint.png differ diff --git a/graphics/pokemon/poliwag/footprint.png b/graphics/pokemon/poliwag/footprint.png index 04e411726..adf2d1a6c 100644 Binary files a/graphics/pokemon/poliwag/footprint.png and b/graphics/pokemon/poliwag/footprint.png differ diff --git a/graphics/pokemon/poliwhirl/footprint.png b/graphics/pokemon/poliwhirl/footprint.png index 14f6c2ea9..e058bb601 100644 Binary files a/graphics/pokemon/poliwhirl/footprint.png and b/graphics/pokemon/poliwhirl/footprint.png differ diff --git a/graphics/pokemon/poliwrath/footprint.png b/graphics/pokemon/poliwrath/footprint.png index 8f562fcef..393f8191c 100644 Binary files a/graphics/pokemon/poliwrath/footprint.png and b/graphics/pokemon/poliwrath/footprint.png differ diff --git a/graphics/pokemon/polteageist/footprint.png b/graphics/pokemon/polteageist/footprint.png index 619fab987..2a1c1f3dd 100644 Binary files a/graphics/pokemon/polteageist/footprint.png and b/graphics/pokemon/polteageist/footprint.png differ diff --git a/graphics/pokemon/ponyta/footprint.png b/graphics/pokemon/ponyta/footprint.png index 906ee7a5b..593b4eae8 100644 Binary files a/graphics/pokemon/ponyta/footprint.png and b/graphics/pokemon/ponyta/footprint.png differ diff --git a/graphics/pokemon/poochyena/footprint.png b/graphics/pokemon/poochyena/footprint.png index c4afe995f..820645c7c 100644 Binary files a/graphics/pokemon/poochyena/footprint.png and b/graphics/pokemon/poochyena/footprint.png differ diff --git a/graphics/pokemon/popplio/footprint.png b/graphics/pokemon/popplio/footprint.png index 3f2666932..2449369fd 100644 Binary files a/graphics/pokemon/popplio/footprint.png and b/graphics/pokemon/popplio/footprint.png differ diff --git a/graphics/pokemon/porygon/footprint.png b/graphics/pokemon/porygon/footprint.png index 02243e3bc..39764c24a 100644 Binary files a/graphics/pokemon/porygon/footprint.png and b/graphics/pokemon/porygon/footprint.png differ diff --git a/graphics/pokemon/porygon2/footprint.png b/graphics/pokemon/porygon2/footprint.png index f92224af3..40f947b46 100644 Binary files a/graphics/pokemon/porygon2/footprint.png and b/graphics/pokemon/porygon2/footprint.png differ diff --git a/graphics/pokemon/porygon_z/footprint.png b/graphics/pokemon/porygon_z/footprint.png index d62460ec0..2a1c1f3dd 100644 Binary files a/graphics/pokemon/porygon_z/footprint.png and b/graphics/pokemon/porygon_z/footprint.png differ diff --git a/graphics/pokemon/primarina/footprint.png b/graphics/pokemon/primarina/footprint.png index 53b9f28d4..2449369fd 100644 Binary files a/graphics/pokemon/primarina/footprint.png and b/graphics/pokemon/primarina/footprint.png differ diff --git a/graphics/pokemon/primeape/footprint.png b/graphics/pokemon/primeape/footprint.png index f4c90ee17..76f77d387 100644 Binary files a/graphics/pokemon/primeape/footprint.png and b/graphics/pokemon/primeape/footprint.png differ diff --git a/graphics/pokemon/prinplup/footprint.png b/graphics/pokemon/prinplup/footprint.png index 97c0d23c5..ce7d3a216 100644 Binary files a/graphics/pokemon/prinplup/footprint.png and b/graphics/pokemon/prinplup/footprint.png differ diff --git a/graphics/pokemon/probopass/footprint.png b/graphics/pokemon/probopass/footprint.png index 80d818f62..9ed1a5fb4 100644 Binary files a/graphics/pokemon/probopass/footprint.png and b/graphics/pokemon/probopass/footprint.png differ diff --git a/graphics/pokemon/psyduck/footprint.png b/graphics/pokemon/psyduck/footprint.png index 4dff44800..fc06dcd4f 100644 Binary files a/graphics/pokemon/psyduck/footprint.png and b/graphics/pokemon/psyduck/footprint.png differ diff --git a/graphics/pokemon/pumpkaboo/footprint.png b/graphics/pokemon/pumpkaboo/footprint.png index adb8b164d..a9b0e33c2 100644 Binary files a/graphics/pokemon/pumpkaboo/footprint.png and b/graphics/pokemon/pumpkaboo/footprint.png differ diff --git a/graphics/pokemon/pupitar/footprint.png b/graphics/pokemon/pupitar/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/pupitar/footprint.png and b/graphics/pokemon/pupitar/footprint.png differ diff --git a/graphics/pokemon/purrloin/footprint.png b/graphics/pokemon/purrloin/footprint.png index cf38aac05..360b77387 100644 Binary files a/graphics/pokemon/purrloin/footprint.png and b/graphics/pokemon/purrloin/footprint.png differ diff --git a/graphics/pokemon/purugly/footprint.png b/graphics/pokemon/purugly/footprint.png index 7c8583beb..2d5278482 100644 Binary files a/graphics/pokemon/purugly/footprint.png and b/graphics/pokemon/purugly/footprint.png differ diff --git a/graphics/pokemon/pyroar/footprint.png b/graphics/pokemon/pyroar/footprint.png index 6cf1f3c15..7e99c4051 100644 Binary files a/graphics/pokemon/pyroar/footprint.png and b/graphics/pokemon/pyroar/footprint.png differ diff --git a/graphics/pokemon/pyukumuku/footprint.png b/graphics/pokemon/pyukumuku/footprint.png index fa1ffd4ac..2449369fd 100644 Binary files a/graphics/pokemon/pyukumuku/footprint.png and b/graphics/pokemon/pyukumuku/footprint.png differ diff --git a/graphics/pokemon/quagsire/footprint.png b/graphics/pokemon/quagsire/footprint.png index d04039763..5d84baf3d 100644 Binary files a/graphics/pokemon/quagsire/footprint.png and b/graphics/pokemon/quagsire/footprint.png differ diff --git a/graphics/pokemon/question_mark/footprint.png b/graphics/pokemon/question_mark/footprint.png index 7c4f45eaa..8da752a46 100644 Binary files a/graphics/pokemon/question_mark/footprint.png and b/graphics/pokemon/question_mark/footprint.png differ diff --git a/graphics/pokemon/quilava/footprint.png b/graphics/pokemon/quilava/footprint.png index 28324dd7c..46c185bff 100644 Binary files a/graphics/pokemon/quilava/footprint.png and b/graphics/pokemon/quilava/footprint.png differ diff --git a/graphics/pokemon/quilladin/footprint.png b/graphics/pokemon/quilladin/footprint.png index 0c1295e1f..f9537696e 100644 Binary files a/graphics/pokemon/quilladin/footprint.png and b/graphics/pokemon/quilladin/footprint.png differ diff --git a/graphics/pokemon/qwilfish/footprint.png b/graphics/pokemon/qwilfish/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/qwilfish/footprint.png and b/graphics/pokemon/qwilfish/footprint.png differ diff --git a/graphics/pokemon/raboot/footprint.png b/graphics/pokemon/raboot/footprint.png index e8e0f26b6..7325ba1e6 100644 Binary files a/graphics/pokemon/raboot/footprint.png and b/graphics/pokemon/raboot/footprint.png differ diff --git a/graphics/pokemon/raichu/footprint.png b/graphics/pokemon/raichu/footprint.png index 9f2ac3993..3f631ab87 100644 Binary files a/graphics/pokemon/raichu/footprint.png and b/graphics/pokemon/raichu/footprint.png differ diff --git a/graphics/pokemon/raikou/footprint.png b/graphics/pokemon/raikou/footprint.png index b7081dcd3..b7cd9c7db 100644 Binary files a/graphics/pokemon/raikou/footprint.png and b/graphics/pokemon/raikou/footprint.png differ diff --git a/graphics/pokemon/ralts/footprint.png b/graphics/pokemon/ralts/footprint.png index 6965dbe60..a9b0e33c2 100644 Binary files a/graphics/pokemon/ralts/footprint.png and b/graphics/pokemon/ralts/footprint.png differ diff --git a/graphics/pokemon/rampardos/footprint.png b/graphics/pokemon/rampardos/footprint.png index b866c2b7f..3d4752183 100644 Binary files a/graphics/pokemon/rampardos/footprint.png and b/graphics/pokemon/rampardos/footprint.png differ diff --git a/graphics/pokemon/rapidash/footprint.png b/graphics/pokemon/rapidash/footprint.png index 3361489fd..ffa2c80a9 100644 Binary files a/graphics/pokemon/rapidash/footprint.png and b/graphics/pokemon/rapidash/footprint.png differ diff --git a/graphics/pokemon/raticate/footprint.png b/graphics/pokemon/raticate/footprint.png index 6628cfdd7..e1462e71a 100644 Binary files a/graphics/pokemon/raticate/footprint.png and b/graphics/pokemon/raticate/footprint.png differ diff --git a/graphics/pokemon/rattata/footprint.png b/graphics/pokemon/rattata/footprint.png index 008b1ddc0..2f8e0312a 100644 Binary files a/graphics/pokemon/rattata/footprint.png and b/graphics/pokemon/rattata/footprint.png differ diff --git a/graphics/pokemon/rayquaza/footprint.png b/graphics/pokemon/rayquaza/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/rayquaza/footprint.png and b/graphics/pokemon/rayquaza/footprint.png differ diff --git a/graphics/pokemon/regice/footprint.png b/graphics/pokemon/regice/footprint.png index 6965dbe60..a9b0e33c2 100644 Binary files a/graphics/pokemon/regice/footprint.png and b/graphics/pokemon/regice/footprint.png differ diff --git a/graphics/pokemon/regidrago/footprint.png b/graphics/pokemon/regidrago/footprint.png index 616bef0de..c902ede82 100644 Binary files a/graphics/pokemon/regidrago/footprint.png and b/graphics/pokemon/regidrago/footprint.png differ diff --git a/graphics/pokemon/regieleki/footprint.png b/graphics/pokemon/regieleki/footprint.png index f64e6d1b9..a9b0e33c2 100644 Binary files a/graphics/pokemon/regieleki/footprint.png and b/graphics/pokemon/regieleki/footprint.png differ diff --git a/graphics/pokemon/regigigas/footprint.png b/graphics/pokemon/regigigas/footprint.png index 25900cf29..2f191eb0c 100644 Binary files a/graphics/pokemon/regigigas/footprint.png and b/graphics/pokemon/regigigas/footprint.png differ diff --git a/graphics/pokemon/regirock/footprint.png b/graphics/pokemon/regirock/footprint.png index 44da2a57f..d7a4380a7 100644 Binary files a/graphics/pokemon/regirock/footprint.png and b/graphics/pokemon/regirock/footprint.png differ diff --git a/graphics/pokemon/registeel/footprint.png b/graphics/pokemon/registeel/footprint.png index e191faabc..7f4ee5797 100644 Binary files a/graphics/pokemon/registeel/footprint.png and b/graphics/pokemon/registeel/footprint.png differ diff --git a/graphics/pokemon/relicanth/footprint.png b/graphics/pokemon/relicanth/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/relicanth/footprint.png and b/graphics/pokemon/relicanth/footprint.png differ diff --git a/graphics/pokemon/remoraid/footprint.png b/graphics/pokemon/remoraid/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/remoraid/footprint.png and b/graphics/pokemon/remoraid/footprint.png differ diff --git a/graphics/pokemon/reshiram/footprint.png b/graphics/pokemon/reshiram/footprint.png index d0adc93b7..4ddbf3ad5 100644 Binary files a/graphics/pokemon/reshiram/footprint.png and b/graphics/pokemon/reshiram/footprint.png differ diff --git a/graphics/pokemon/reuniclus/footprint.png b/graphics/pokemon/reuniclus/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/reuniclus/footprint.png and b/graphics/pokemon/reuniclus/footprint.png differ diff --git a/graphics/pokemon/rhydon/footprint.png b/graphics/pokemon/rhydon/footprint.png index df6d8fced..cd8a9952d 100644 Binary files a/graphics/pokemon/rhydon/footprint.png and b/graphics/pokemon/rhydon/footprint.png differ diff --git a/graphics/pokemon/rhyhorn/footprint.png b/graphics/pokemon/rhyhorn/footprint.png index 632b753c2..84e88598c 100644 Binary files a/graphics/pokemon/rhyhorn/footprint.png and b/graphics/pokemon/rhyhorn/footprint.png differ diff --git a/graphics/pokemon/rhyperior/footprint.png b/graphics/pokemon/rhyperior/footprint.png index 6747036a6..b8a66cd9d 100644 Binary files a/graphics/pokemon/rhyperior/footprint.png and b/graphics/pokemon/rhyperior/footprint.png differ diff --git a/graphics/pokemon/ribombee/footprint.png b/graphics/pokemon/ribombee/footprint.png index 5f908e974..7c0499f09 100644 Binary files a/graphics/pokemon/ribombee/footprint.png and b/graphics/pokemon/ribombee/footprint.png differ diff --git a/graphics/pokemon/rillaboom/footprint.png b/graphics/pokemon/rillaboom/footprint.png index 2711be60c..57fa8220f 100644 Binary files a/graphics/pokemon/rillaboom/footprint.png and b/graphics/pokemon/rillaboom/footprint.png differ diff --git a/graphics/pokemon/riolu/footprint.png b/graphics/pokemon/riolu/footprint.png index 4ee490c0e..a011d5c50 100644 Binary files a/graphics/pokemon/riolu/footprint.png and b/graphics/pokemon/riolu/footprint.png differ diff --git a/graphics/pokemon/rockruff/footprint.png b/graphics/pokemon/rockruff/footprint.png index 486ec0623..da66d0739 100644 Binary files a/graphics/pokemon/rockruff/footprint.png and b/graphics/pokemon/rockruff/footprint.png differ diff --git a/graphics/pokemon/roggenrola/footprint.png b/graphics/pokemon/roggenrola/footprint.png index f9f68c09f..2f4f594ad 100644 Binary files a/graphics/pokemon/roggenrola/footprint.png and b/graphics/pokemon/roggenrola/footprint.png differ diff --git a/graphics/pokemon/rolycoly/footprint.png b/graphics/pokemon/rolycoly/footprint.png index d33007c58..5abe864e7 100644 Binary files a/graphics/pokemon/rolycoly/footprint.png and b/graphics/pokemon/rolycoly/footprint.png differ diff --git a/graphics/pokemon/rookidee/footprint.png b/graphics/pokemon/rookidee/footprint.png index 82cf54523..3422576be 100644 Binary files a/graphics/pokemon/rookidee/footprint.png and b/graphics/pokemon/rookidee/footprint.png differ diff --git a/graphics/pokemon/roselia/footprint.png b/graphics/pokemon/roselia/footprint.png index bedf2ab69..6ea3494a0 100644 Binary files a/graphics/pokemon/roselia/footprint.png and b/graphics/pokemon/roselia/footprint.png differ diff --git a/graphics/pokemon/roserade/footprint.png b/graphics/pokemon/roserade/footprint.png index f0c9e0209..b15fbf9ea 100644 Binary files a/graphics/pokemon/roserade/footprint.png and b/graphics/pokemon/roserade/footprint.png differ diff --git a/graphics/pokemon/rotom/normal/footprint.png b/graphics/pokemon/rotom/normal/footprint.png index 56707bd4e..2449369fd 100644 Binary files a/graphics/pokemon/rotom/normal/footprint.png and b/graphics/pokemon/rotom/normal/footprint.png differ diff --git a/graphics/pokemon/rowlet/footprint.png b/graphics/pokemon/rowlet/footprint.png index a67af910f..3422576be 100644 Binary files a/graphics/pokemon/rowlet/footprint.png and b/graphics/pokemon/rowlet/footprint.png differ diff --git a/graphics/pokemon/rufflet/footprint.png b/graphics/pokemon/rufflet/footprint.png index 83b0235ae..b31131033 100644 Binary files a/graphics/pokemon/rufflet/footprint.png and b/graphics/pokemon/rufflet/footprint.png differ diff --git a/graphics/pokemon/runerigus/footprint.png b/graphics/pokemon/runerigus/footprint.png index 4c2de9222..2449369fd 100644 Binary files a/graphics/pokemon/runerigus/footprint.png and b/graphics/pokemon/runerigus/footprint.png differ diff --git a/graphics/pokemon/sableye/footprint.png b/graphics/pokemon/sableye/footprint.png index 204d8da54..45f0e8bfe 100644 Binary files a/graphics/pokemon/sableye/footprint.png and b/graphics/pokemon/sableye/footprint.png differ diff --git a/graphics/pokemon/salamence/footprint.png b/graphics/pokemon/salamence/footprint.png index 2440a370f..b943d0765 100644 Binary files a/graphics/pokemon/salamence/footprint.png and b/graphics/pokemon/salamence/footprint.png differ diff --git a/graphics/pokemon/salandit/footprint.png b/graphics/pokemon/salandit/footprint.png index 3490ad768..3a4bf8294 100644 Binary files a/graphics/pokemon/salandit/footprint.png and b/graphics/pokemon/salandit/footprint.png differ diff --git a/graphics/pokemon/salazzle/footprint.png b/graphics/pokemon/salazzle/footprint.png index c8eb90af9..c97e78b3a 100644 Binary files a/graphics/pokemon/salazzle/footprint.png and b/graphics/pokemon/salazzle/footprint.png differ diff --git a/graphics/pokemon/samurott/footprint.png b/graphics/pokemon/samurott/footprint.png index afb85761b..5c195e72c 100644 Binary files a/graphics/pokemon/samurott/footprint.png and b/graphics/pokemon/samurott/footprint.png differ diff --git a/graphics/pokemon/sandaconda/footprint.png b/graphics/pokemon/sandaconda/footprint.png index 9de287226..2449369fd 100644 Binary files a/graphics/pokemon/sandaconda/footprint.png and b/graphics/pokemon/sandaconda/footprint.png differ diff --git a/graphics/pokemon/sandile/footprint.png b/graphics/pokemon/sandile/footprint.png index 3465dd0d0..c12ab0890 100644 Binary files a/graphics/pokemon/sandile/footprint.png and b/graphics/pokemon/sandile/footprint.png differ diff --git a/graphics/pokemon/sandshrew/footprint.png b/graphics/pokemon/sandshrew/footprint.png index 481de0993..030c4165d 100644 Binary files a/graphics/pokemon/sandshrew/footprint.png and b/graphics/pokemon/sandshrew/footprint.png differ diff --git a/graphics/pokemon/sandslash/footprint.png b/graphics/pokemon/sandslash/footprint.png index 431ca99be..231e78e9f 100644 Binary files a/graphics/pokemon/sandslash/footprint.png and b/graphics/pokemon/sandslash/footprint.png differ diff --git a/graphics/pokemon/sandygast/footprint.png b/graphics/pokemon/sandygast/footprint.png index 87078a7b4..2449369fd 100644 Binary files a/graphics/pokemon/sandygast/footprint.png and b/graphics/pokemon/sandygast/footprint.png differ diff --git a/graphics/pokemon/sawk/footprint.png b/graphics/pokemon/sawk/footprint.png index d4a0af888..3543fa37b 100644 Binary files a/graphics/pokemon/sawk/footprint.png and b/graphics/pokemon/sawk/footprint.png differ diff --git a/graphics/pokemon/sawsbuck/footprint.png b/graphics/pokemon/sawsbuck/footprint.png index 39a7b0bf9..57877ad88 100644 Binary files a/graphics/pokemon/sawsbuck/footprint.png and b/graphics/pokemon/sawsbuck/footprint.png differ diff --git a/graphics/pokemon/scatterbug/footprint.png b/graphics/pokemon/scatterbug/footprint.png index a62c12a81..a9b0e33c2 100644 Binary files a/graphics/pokemon/scatterbug/footprint.png and b/graphics/pokemon/scatterbug/footprint.png differ diff --git a/graphics/pokemon/sceptile/footprint.png b/graphics/pokemon/sceptile/footprint.png index 1958a4778..fb829943f 100644 Binary files a/graphics/pokemon/sceptile/footprint.png and b/graphics/pokemon/sceptile/footprint.png differ diff --git a/graphics/pokemon/scizor/footprint.png b/graphics/pokemon/scizor/footprint.png index 00824374a..9ab66e47e 100644 Binary files a/graphics/pokemon/scizor/footprint.png and b/graphics/pokemon/scizor/footprint.png differ diff --git a/graphics/pokemon/scolipede/footprint.png b/graphics/pokemon/scolipede/footprint.png index d87da5cd6..5446956b9 100644 Binary files a/graphics/pokemon/scolipede/footprint.png and b/graphics/pokemon/scolipede/footprint.png differ diff --git a/graphics/pokemon/scorbunny/footprint.png b/graphics/pokemon/scorbunny/footprint.png index 03b76efa1..9723a8245 100644 Binary files a/graphics/pokemon/scorbunny/footprint.png and b/graphics/pokemon/scorbunny/footprint.png differ diff --git a/graphics/pokemon/scrafty/footprint.png b/graphics/pokemon/scrafty/footprint.png index 49d790110..ea80f8f89 100644 Binary files a/graphics/pokemon/scrafty/footprint.png and b/graphics/pokemon/scrafty/footprint.png differ diff --git a/graphics/pokemon/scraggy/footprint.png b/graphics/pokemon/scraggy/footprint.png index 422b9a2b8..c2c45ebec 100644 Binary files a/graphics/pokemon/scraggy/footprint.png and b/graphics/pokemon/scraggy/footprint.png differ diff --git a/graphics/pokemon/scyther/footprint.png b/graphics/pokemon/scyther/footprint.png index c6b773028..e12c46d3c 100644 Binary files a/graphics/pokemon/scyther/footprint.png and b/graphics/pokemon/scyther/footprint.png differ diff --git a/graphics/pokemon/seadra/footprint.png b/graphics/pokemon/seadra/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/seadra/footprint.png and b/graphics/pokemon/seadra/footprint.png differ diff --git a/graphics/pokemon/seaking/footprint.png b/graphics/pokemon/seaking/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/seaking/footprint.png and b/graphics/pokemon/seaking/footprint.png differ diff --git a/graphics/pokemon/sealeo/footprint.png b/graphics/pokemon/sealeo/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/sealeo/footprint.png and b/graphics/pokemon/sealeo/footprint.png differ diff --git a/graphics/pokemon/seedot/footprint.png b/graphics/pokemon/seedot/footprint.png index 9b41f13ed..ef9f52256 100644 Binary files a/graphics/pokemon/seedot/footprint.png and b/graphics/pokemon/seedot/footprint.png differ diff --git a/graphics/pokemon/seel/footprint.png b/graphics/pokemon/seel/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/seel/footprint.png and b/graphics/pokemon/seel/footprint.png differ diff --git a/graphics/pokemon/seismitoad/footprint.png b/graphics/pokemon/seismitoad/footprint.png index 2a5908b21..703432bae 100644 Binary files a/graphics/pokemon/seismitoad/footprint.png and b/graphics/pokemon/seismitoad/footprint.png differ diff --git a/graphics/pokemon/sentret/footprint.png b/graphics/pokemon/sentret/footprint.png index 49ab94c0b..398cdb462 100644 Binary files a/graphics/pokemon/sentret/footprint.png and b/graphics/pokemon/sentret/footprint.png differ diff --git a/graphics/pokemon/serperior/footprint.png b/graphics/pokemon/serperior/footprint.png index ed7c15888..2449369fd 100644 Binary files a/graphics/pokemon/serperior/footprint.png and b/graphics/pokemon/serperior/footprint.png differ diff --git a/graphics/pokemon/servine/footprint.png b/graphics/pokemon/servine/footprint.png index 53cebf08a..d1454a5f1 100644 Binary files a/graphics/pokemon/servine/footprint.png and b/graphics/pokemon/servine/footprint.png differ diff --git a/graphics/pokemon/seviper/footprint.png b/graphics/pokemon/seviper/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/seviper/footprint.png and b/graphics/pokemon/seviper/footprint.png differ diff --git a/graphics/pokemon/sewaddle/footprint.png b/graphics/pokemon/sewaddle/footprint.png index 4cc2972cf..2a1c1f3dd 100644 Binary files a/graphics/pokemon/sewaddle/footprint.png and b/graphics/pokemon/sewaddle/footprint.png differ diff --git a/graphics/pokemon/sharpedo/footprint.png b/graphics/pokemon/sharpedo/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/sharpedo/footprint.png and b/graphics/pokemon/sharpedo/footprint.png differ diff --git a/graphics/pokemon/shaymin/footprint.png b/graphics/pokemon/shaymin/footprint.png index 7095c2c43..6163774b5 100644 Binary files a/graphics/pokemon/shaymin/footprint.png and b/graphics/pokemon/shaymin/footprint.png differ diff --git a/graphics/pokemon/shedinja/footprint.png b/graphics/pokemon/shedinja/footprint.png index d4118d5e6..928f915e9 100644 Binary files a/graphics/pokemon/shedinja/footprint.png and b/graphics/pokemon/shedinja/footprint.png differ diff --git a/graphics/pokemon/shelgon/footprint.png b/graphics/pokemon/shelgon/footprint.png index e2d61b9bc..5c7a6ab3f 100644 Binary files a/graphics/pokemon/shelgon/footprint.png and b/graphics/pokemon/shelgon/footprint.png differ diff --git a/graphics/pokemon/shellder/footprint.png b/graphics/pokemon/shellder/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/shellder/footprint.png and b/graphics/pokemon/shellder/footprint.png differ diff --git a/graphics/pokemon/shellos/footprint.png b/graphics/pokemon/shellos/footprint.png index 760c80223..750b1114f 100644 Binary files a/graphics/pokemon/shellos/footprint.png and b/graphics/pokemon/shellos/footprint.png differ diff --git a/graphics/pokemon/shelmet/footprint.png b/graphics/pokemon/shelmet/footprint.png index fdd7cd4d3..2a1c1f3dd 100644 Binary files a/graphics/pokemon/shelmet/footprint.png and b/graphics/pokemon/shelmet/footprint.png differ diff --git a/graphics/pokemon/shieldon/footprint.png b/graphics/pokemon/shieldon/footprint.png index 2bce4070e..d3adb6470 100644 Binary files a/graphics/pokemon/shieldon/footprint.png and b/graphics/pokemon/shieldon/footprint.png differ diff --git a/graphics/pokemon/shiftry/footprint.png b/graphics/pokemon/shiftry/footprint.png index 3ea82a3da..3b3a4f53d 100644 Binary files a/graphics/pokemon/shiftry/footprint.png and b/graphics/pokemon/shiftry/footprint.png differ diff --git a/graphics/pokemon/shiinotic/footprint.png b/graphics/pokemon/shiinotic/footprint.png index b2db8ea72..5d01e97d6 100644 Binary files a/graphics/pokemon/shiinotic/footprint.png and b/graphics/pokemon/shiinotic/footprint.png differ diff --git a/graphics/pokemon/shinx/footprint.png b/graphics/pokemon/shinx/footprint.png index 4cdcd7488..8551a6149 100644 Binary files a/graphics/pokemon/shinx/footprint.png and b/graphics/pokemon/shinx/footprint.png differ diff --git a/graphics/pokemon/shroomish/footprint.png b/graphics/pokemon/shroomish/footprint.png index d3a5986ce..1187f2d5e 100644 Binary files a/graphics/pokemon/shroomish/footprint.png and b/graphics/pokemon/shroomish/footprint.png differ diff --git a/graphics/pokemon/shuckle/footprint.png b/graphics/pokemon/shuckle/footprint.png index e26b60bcd..169bb4cf5 100644 Binary files a/graphics/pokemon/shuckle/footprint.png and b/graphics/pokemon/shuckle/footprint.png differ diff --git a/graphics/pokemon/shuppet/footprint.png b/graphics/pokemon/shuppet/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/shuppet/footprint.png and b/graphics/pokemon/shuppet/footprint.png differ diff --git a/graphics/pokemon/sigilyph/footprint.png b/graphics/pokemon/sigilyph/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/sigilyph/footprint.png and b/graphics/pokemon/sigilyph/footprint.png differ diff --git a/graphics/pokemon/silcoon/footprint.png b/graphics/pokemon/silcoon/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/silcoon/footprint.png and b/graphics/pokemon/silcoon/footprint.png differ diff --git a/graphics/pokemon/silicobra/footprint.png b/graphics/pokemon/silicobra/footprint.png index f16726255..2449369fd 100644 Binary files a/graphics/pokemon/silicobra/footprint.png and b/graphics/pokemon/silicobra/footprint.png differ diff --git a/graphics/pokemon/silvally/footprint.png b/graphics/pokemon/silvally/footprint.png index b5542742f..e01a0a962 100644 Binary files a/graphics/pokemon/silvally/footprint.png and b/graphics/pokemon/silvally/footprint.png differ diff --git a/graphics/pokemon/simipour/footprint.png b/graphics/pokemon/simipour/footprint.png index 4c2d69b9a..69e56396c 100644 Binary files a/graphics/pokemon/simipour/footprint.png and b/graphics/pokemon/simipour/footprint.png differ diff --git a/graphics/pokemon/simisage/footprint.png b/graphics/pokemon/simisage/footprint.png index 4c2d69b9a..69e56396c 100644 Binary files a/graphics/pokemon/simisage/footprint.png and b/graphics/pokemon/simisage/footprint.png differ diff --git a/graphics/pokemon/simisear/footprint.png b/graphics/pokemon/simisear/footprint.png index 4c2d69b9a..69e56396c 100644 Binary files a/graphics/pokemon/simisear/footprint.png and b/graphics/pokemon/simisear/footprint.png differ diff --git a/graphics/pokemon/sinistea/footprint.png b/graphics/pokemon/sinistea/footprint.png index dcea8100b..2449369fd 100644 Binary files a/graphics/pokemon/sinistea/footprint.png and b/graphics/pokemon/sinistea/footprint.png differ diff --git a/graphics/pokemon/sirfetchd/footprint.png b/graphics/pokemon/sirfetchd/footprint.png index 78a8ecb4f..cbfca034d 100644 Binary files a/graphics/pokemon/sirfetchd/footprint.png and b/graphics/pokemon/sirfetchd/footprint.png differ diff --git a/graphics/pokemon/sizzlipede/footprint.png b/graphics/pokemon/sizzlipede/footprint.png index 44b5823d2..a9b0e33c2 100644 Binary files a/graphics/pokemon/sizzlipede/footprint.png and b/graphics/pokemon/sizzlipede/footprint.png differ diff --git a/graphics/pokemon/skarmory/footprint.png b/graphics/pokemon/skarmory/footprint.png index 1134fec29..3f0b2d311 100644 Binary files a/graphics/pokemon/skarmory/footprint.png and b/graphics/pokemon/skarmory/footprint.png differ diff --git a/graphics/pokemon/skiddo/footprint.png b/graphics/pokemon/skiddo/footprint.png index ddbc09b2c..a487ee98c 100644 Binary files a/graphics/pokemon/skiddo/footprint.png and b/graphics/pokemon/skiddo/footprint.png differ diff --git a/graphics/pokemon/skiploom/footprint.png b/graphics/pokemon/skiploom/footprint.png index efa7f5034..544ef0ea6 100644 Binary files a/graphics/pokemon/skiploom/footprint.png and b/graphics/pokemon/skiploom/footprint.png differ diff --git a/graphics/pokemon/skitty/footprint.png b/graphics/pokemon/skitty/footprint.png index 355153dcb..2e78b5093 100644 Binary files a/graphics/pokemon/skitty/footprint.png and b/graphics/pokemon/skitty/footprint.png differ diff --git a/graphics/pokemon/skorupi/footprint.png b/graphics/pokemon/skorupi/footprint.png index 19a3aceea..a9b0e33c2 100644 Binary files a/graphics/pokemon/skorupi/footprint.png and b/graphics/pokemon/skorupi/footprint.png differ diff --git a/graphics/pokemon/skrelp/footprint.png b/graphics/pokemon/skrelp/footprint.png index 4320ad16d..2449369fd 100644 Binary files a/graphics/pokemon/skrelp/footprint.png and b/graphics/pokemon/skrelp/footprint.png differ diff --git a/graphics/pokemon/skuntank/footprint.png b/graphics/pokemon/skuntank/footprint.png index ae5f11111..859fbc883 100644 Binary files a/graphics/pokemon/skuntank/footprint.png and b/graphics/pokemon/skuntank/footprint.png differ diff --git a/graphics/pokemon/skwovet/footprint.png b/graphics/pokemon/skwovet/footprint.png index d60ef0d6b..2e51e1df7 100644 Binary files a/graphics/pokemon/skwovet/footprint.png and b/graphics/pokemon/skwovet/footprint.png differ diff --git a/graphics/pokemon/slaking/footprint.png b/graphics/pokemon/slaking/footprint.png index c2c20413b..68e966d7d 100644 Binary files a/graphics/pokemon/slaking/footprint.png and b/graphics/pokemon/slaking/footprint.png differ diff --git a/graphics/pokemon/slakoth/footprint.png b/graphics/pokemon/slakoth/footprint.png index ec258f41b..8aedbd79e 100644 Binary files a/graphics/pokemon/slakoth/footprint.png and b/graphics/pokemon/slakoth/footprint.png differ diff --git a/graphics/pokemon/sliggoo/footprint.png b/graphics/pokemon/sliggoo/footprint.png index f709e0796..2449369fd 100644 Binary files a/graphics/pokemon/sliggoo/footprint.png and b/graphics/pokemon/sliggoo/footprint.png differ diff --git a/graphics/pokemon/slowbro/footprint.png b/graphics/pokemon/slowbro/footprint.png index c4f82e405..0bcb0789c 100644 Binary files a/graphics/pokemon/slowbro/footprint.png and b/graphics/pokemon/slowbro/footprint.png differ diff --git a/graphics/pokemon/slowking/footprint.png b/graphics/pokemon/slowking/footprint.png index 52593624a..e85d1307c 100644 Binary files a/graphics/pokemon/slowking/footprint.png and b/graphics/pokemon/slowking/footprint.png differ diff --git a/graphics/pokemon/slowpoke/footprint.png b/graphics/pokemon/slowpoke/footprint.png index a66ebbc32..f3330b57f 100644 Binary files a/graphics/pokemon/slowpoke/footprint.png and b/graphics/pokemon/slowpoke/footprint.png differ diff --git a/graphics/pokemon/slugma/footprint.png b/graphics/pokemon/slugma/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/slugma/footprint.png and b/graphics/pokemon/slugma/footprint.png differ diff --git a/graphics/pokemon/slurpuff/footprint.png b/graphics/pokemon/slurpuff/footprint.png index 4d9cf0915..2a1c1f3dd 100644 Binary files a/graphics/pokemon/slurpuff/footprint.png and b/graphics/pokemon/slurpuff/footprint.png differ diff --git a/graphics/pokemon/smeargle/footprint.png b/graphics/pokemon/smeargle/footprint.png index b946130cd..8521b26fe 100644 Binary files a/graphics/pokemon/smeargle/footprint.png and b/graphics/pokemon/smeargle/footprint.png differ diff --git a/graphics/pokemon/smoochum/footprint.png b/graphics/pokemon/smoochum/footprint.png index e901d9334..15461e49a 100644 Binary files a/graphics/pokemon/smoochum/footprint.png and b/graphics/pokemon/smoochum/footprint.png differ diff --git a/graphics/pokemon/sneasel/footprint.png b/graphics/pokemon/sneasel/footprint.png index 2159ef3dc..c3472d32a 100644 Binary files a/graphics/pokemon/sneasel/footprint.png and b/graphics/pokemon/sneasel/footprint.png differ diff --git a/graphics/pokemon/snivy/footprint.png b/graphics/pokemon/snivy/footprint.png index bffe242b8..9a2e33801 100644 Binary files a/graphics/pokemon/snivy/footprint.png and b/graphics/pokemon/snivy/footprint.png differ diff --git a/graphics/pokemon/snom/footprint.png b/graphics/pokemon/snom/footprint.png index 077d66773..2449369fd 100644 Binary files a/graphics/pokemon/snom/footprint.png and b/graphics/pokemon/snom/footprint.png differ diff --git a/graphics/pokemon/snorlax/footprint.png b/graphics/pokemon/snorlax/footprint.png index d3d25c4bc..d7f605b5e 100644 Binary files a/graphics/pokemon/snorlax/footprint.png and b/graphics/pokemon/snorlax/footprint.png differ diff --git a/graphics/pokemon/snorunt/footprint.png b/graphics/pokemon/snorunt/footprint.png index 14277b506..31a4ac394 100644 Binary files a/graphics/pokemon/snorunt/footprint.png and b/graphics/pokemon/snorunt/footprint.png differ diff --git a/graphics/pokemon/snover/footprint.png b/graphics/pokemon/snover/footprint.png index 25c418fae..43231ba10 100644 Binary files a/graphics/pokemon/snover/footprint.png and b/graphics/pokemon/snover/footprint.png differ diff --git a/graphics/pokemon/snubbull/footprint.png b/graphics/pokemon/snubbull/footprint.png index 443847cdd..b7eb2028c 100644 Binary files a/graphics/pokemon/snubbull/footprint.png and b/graphics/pokemon/snubbull/footprint.png differ diff --git a/graphics/pokemon/sobble/footprint.png b/graphics/pokemon/sobble/footprint.png index 7cca4a4c5..1ef1bf2f9 100644 Binary files a/graphics/pokemon/sobble/footprint.png and b/graphics/pokemon/sobble/footprint.png differ diff --git a/graphics/pokemon/solgaleo/footprint.png b/graphics/pokemon/solgaleo/footprint.png index 4ad6b8551..2b0b63056 100644 Binary files a/graphics/pokemon/solgaleo/footprint.png and b/graphics/pokemon/solgaleo/footprint.png differ diff --git a/graphics/pokemon/solosis/footprint.png b/graphics/pokemon/solosis/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/solosis/footprint.png and b/graphics/pokemon/solosis/footprint.png differ diff --git a/graphics/pokemon/solrock/footprint.png b/graphics/pokemon/solrock/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/solrock/footprint.png and b/graphics/pokemon/solrock/footprint.png differ diff --git a/graphics/pokemon/spearow/footprint.png b/graphics/pokemon/spearow/footprint.png index 6fe6e4282..3422576be 100644 Binary files a/graphics/pokemon/spearow/footprint.png and b/graphics/pokemon/spearow/footprint.png differ diff --git a/graphics/pokemon/spectrier/footprint.png b/graphics/pokemon/spectrier/footprint.png index 9383b36a7..ffa2c80a9 100644 Binary files a/graphics/pokemon/spectrier/footprint.png and b/graphics/pokemon/spectrier/footprint.png differ diff --git a/graphics/pokemon/spewpa/footprint.png b/graphics/pokemon/spewpa/footprint.png index 3d8347d75..2449369fd 100644 Binary files a/graphics/pokemon/spewpa/footprint.png and b/graphics/pokemon/spewpa/footprint.png differ diff --git a/graphics/pokemon/spheal/footprint.png b/graphics/pokemon/spheal/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/spheal/footprint.png and b/graphics/pokemon/spheal/footprint.png differ diff --git a/graphics/pokemon/spinarak/footprint.png b/graphics/pokemon/spinarak/footprint.png index 6965dbe60..a9b0e33c2 100644 Binary files a/graphics/pokemon/spinarak/footprint.png and b/graphics/pokemon/spinarak/footprint.png differ diff --git a/graphics/pokemon/spinda/footprint.png b/graphics/pokemon/spinda/footprint.png index 7be943a89..688e1ec1e 100644 Binary files a/graphics/pokemon/spinda/footprint.png and b/graphics/pokemon/spinda/footprint.png differ diff --git a/graphics/pokemon/spiritomb/footprint.png b/graphics/pokemon/spiritomb/footprint.png index 48ca15ef6..2449369fd 100644 Binary files a/graphics/pokemon/spiritomb/footprint.png and b/graphics/pokemon/spiritomb/footprint.png differ diff --git a/graphics/pokemon/spoink/footprint.png b/graphics/pokemon/spoink/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/spoink/footprint.png and b/graphics/pokemon/spoink/footprint.png differ diff --git a/graphics/pokemon/spritzee/footprint.png b/graphics/pokemon/spritzee/footprint.png index 5fa392040..a9b0e33c2 100644 Binary files a/graphics/pokemon/spritzee/footprint.png and b/graphics/pokemon/spritzee/footprint.png differ diff --git a/graphics/pokemon/squirtle/footprint.png b/graphics/pokemon/squirtle/footprint.png index 696cd6d42..82e01756c 100644 Binary files a/graphics/pokemon/squirtle/footprint.png and b/graphics/pokemon/squirtle/footprint.png differ diff --git a/graphics/pokemon/stakataka/footprint.png b/graphics/pokemon/stakataka/footprint.png index 70757fc3f..2449369fd 100644 Binary files a/graphics/pokemon/stakataka/footprint.png and b/graphics/pokemon/stakataka/footprint.png differ diff --git a/graphics/pokemon/stantler/footprint.png b/graphics/pokemon/stantler/footprint.png index 7f2b0f532..62e2eb062 100644 Binary files a/graphics/pokemon/stantler/footprint.png and b/graphics/pokemon/stantler/footprint.png differ diff --git a/graphics/pokemon/staraptor/footprint.png b/graphics/pokemon/staraptor/footprint.png index 2ac19fbca..a678ebcdb 100644 Binary files a/graphics/pokemon/staraptor/footprint.png and b/graphics/pokemon/staraptor/footprint.png differ diff --git a/graphics/pokemon/staravia/footprint.png b/graphics/pokemon/staravia/footprint.png index e62001058..91c824e74 100644 Binary files a/graphics/pokemon/staravia/footprint.png and b/graphics/pokemon/staravia/footprint.png differ diff --git a/graphics/pokemon/starly/footprint.png b/graphics/pokemon/starly/footprint.png index 1dec150e7..3c6a10661 100644 Binary files a/graphics/pokemon/starly/footprint.png and b/graphics/pokemon/starly/footprint.png differ diff --git a/graphics/pokemon/starmie/footprint.png b/graphics/pokemon/starmie/footprint.png index c1c0058e7..2a1c1f3dd 100644 Binary files a/graphics/pokemon/starmie/footprint.png and b/graphics/pokemon/starmie/footprint.png differ diff --git a/graphics/pokemon/staryu/footprint.png b/graphics/pokemon/staryu/footprint.png index c1c0058e7..2a1c1f3dd 100644 Binary files a/graphics/pokemon/staryu/footprint.png and b/graphics/pokemon/staryu/footprint.png differ diff --git a/graphics/pokemon/steelix/footprint.png b/graphics/pokemon/steelix/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/steelix/footprint.png and b/graphics/pokemon/steelix/footprint.png differ diff --git a/graphics/pokemon/steenee/footprint.png b/graphics/pokemon/steenee/footprint.png index a699802b1..2a1c1f3dd 100644 Binary files a/graphics/pokemon/steenee/footprint.png and b/graphics/pokemon/steenee/footprint.png differ diff --git a/graphics/pokemon/stonjourner/footprint.png b/graphics/pokemon/stonjourner/footprint.png index 15adc2551..b26759031 100644 Binary files a/graphics/pokemon/stonjourner/footprint.png and b/graphics/pokemon/stonjourner/footprint.png differ diff --git a/graphics/pokemon/stoutland/footprint.png b/graphics/pokemon/stoutland/footprint.png index a0709ec85..0855dd35c 100644 Binary files a/graphics/pokemon/stoutland/footprint.png and b/graphics/pokemon/stoutland/footprint.png differ diff --git a/graphics/pokemon/stufful/footprint.png b/graphics/pokemon/stufful/footprint.png index 1e41dad79..9b9dad7ee 100644 Binary files a/graphics/pokemon/stufful/footprint.png and b/graphics/pokemon/stufful/footprint.png differ diff --git a/graphics/pokemon/stunfisk/footprint.png b/graphics/pokemon/stunfisk/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/stunfisk/footprint.png and b/graphics/pokemon/stunfisk/footprint.png differ diff --git a/graphics/pokemon/stunky/footprint.png b/graphics/pokemon/stunky/footprint.png index b39437ae3..ca5134952 100644 Binary files a/graphics/pokemon/stunky/footprint.png and b/graphics/pokemon/stunky/footprint.png differ diff --git a/graphics/pokemon/sudowoodo/footprint.png b/graphics/pokemon/sudowoodo/footprint.png index 4ed751a79..560ef5e60 100644 Binary files a/graphics/pokemon/sudowoodo/footprint.png and b/graphics/pokemon/sudowoodo/footprint.png differ diff --git a/graphics/pokemon/suicune/footprint.png b/graphics/pokemon/suicune/footprint.png index 946c35dd0..57258fb0c 100644 Binary files a/graphics/pokemon/suicune/footprint.png and b/graphics/pokemon/suicune/footprint.png differ diff --git a/graphics/pokemon/sunflora/footprint.png b/graphics/pokemon/sunflora/footprint.png index f6de3ca9f..fbc42e7a6 100644 Binary files a/graphics/pokemon/sunflora/footprint.png and b/graphics/pokemon/sunflora/footprint.png differ diff --git a/graphics/pokemon/sunkern/footprint.png b/graphics/pokemon/sunkern/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/sunkern/footprint.png and b/graphics/pokemon/sunkern/footprint.png differ diff --git a/graphics/pokemon/surskit/footprint.png b/graphics/pokemon/surskit/footprint.png index e4945976f..bbaf5c68c 100644 Binary files a/graphics/pokemon/surskit/footprint.png and b/graphics/pokemon/surskit/footprint.png differ diff --git a/graphics/pokemon/swablu/footprint.png b/graphics/pokemon/swablu/footprint.png index 7e71113c3..747e2caaa 100644 Binary files a/graphics/pokemon/swablu/footprint.png and b/graphics/pokemon/swablu/footprint.png differ diff --git a/graphics/pokemon/swadloon/footprint.png b/graphics/pokemon/swadloon/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/swadloon/footprint.png and b/graphics/pokemon/swadloon/footprint.png differ diff --git a/graphics/pokemon/swalot/footprint.png b/graphics/pokemon/swalot/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/swalot/footprint.png and b/graphics/pokemon/swalot/footprint.png differ diff --git a/graphics/pokemon/swampert/footprint.png b/graphics/pokemon/swampert/footprint.png index ed223e641..65f7d7e67 100644 Binary files a/graphics/pokemon/swampert/footprint.png and b/graphics/pokemon/swampert/footprint.png differ diff --git a/graphics/pokemon/swanna/footprint.png b/graphics/pokemon/swanna/footprint.png index faf4f9f45..0662ed64a 100644 Binary files a/graphics/pokemon/swanna/footprint.png and b/graphics/pokemon/swanna/footprint.png differ diff --git a/graphics/pokemon/swellow/footprint.png b/graphics/pokemon/swellow/footprint.png index f44a71c29..9757114c0 100644 Binary files a/graphics/pokemon/swellow/footprint.png and b/graphics/pokemon/swellow/footprint.png differ diff --git a/graphics/pokemon/swinub/footprint.png b/graphics/pokemon/swinub/footprint.png index fb56709ec..c1573fe84 100644 Binary files a/graphics/pokemon/swinub/footprint.png and b/graphics/pokemon/swinub/footprint.png differ diff --git a/graphics/pokemon/swirlix/footprint.png b/graphics/pokemon/swirlix/footprint.png index 5fa0c68a5..2449369fd 100644 Binary files a/graphics/pokemon/swirlix/footprint.png and b/graphics/pokemon/swirlix/footprint.png differ diff --git a/graphics/pokemon/swoobat/footprint.png b/graphics/pokemon/swoobat/footprint.png index 5d21e70ad..ad62b014d 100644 Binary files a/graphics/pokemon/swoobat/footprint.png and b/graphics/pokemon/swoobat/footprint.png differ diff --git a/graphics/pokemon/sylveon/footprint.png b/graphics/pokemon/sylveon/footprint.png index 286aa0f56..40d49e2b5 100644 Binary files a/graphics/pokemon/sylveon/footprint.png and b/graphics/pokemon/sylveon/footprint.png differ diff --git a/graphics/pokemon/taillow/footprint.png b/graphics/pokemon/taillow/footprint.png index dbf5c5c6b..a54a5c93f 100644 Binary files a/graphics/pokemon/taillow/footprint.png and b/graphics/pokemon/taillow/footprint.png differ diff --git a/graphics/pokemon/talonflame/footprint.png b/graphics/pokemon/talonflame/footprint.png index 197f4f3e2..ae932fe42 100644 Binary files a/graphics/pokemon/talonflame/footprint.png and b/graphics/pokemon/talonflame/footprint.png differ diff --git a/graphics/pokemon/tangela/footprint.png b/graphics/pokemon/tangela/footprint.png index c05d3b437..2b0c03fa5 100644 Binary files a/graphics/pokemon/tangela/footprint.png and b/graphics/pokemon/tangela/footprint.png differ diff --git a/graphics/pokemon/tangrowth/footprint.png b/graphics/pokemon/tangrowth/footprint.png index 27f8e0dda..dafc4fedf 100644 Binary files a/graphics/pokemon/tangrowth/footprint.png and b/graphics/pokemon/tangrowth/footprint.png differ diff --git a/graphics/pokemon/tapu_bulu/footprint.png b/graphics/pokemon/tapu_bulu/footprint.png index 73d94c7e5..2449369fd 100644 Binary files a/graphics/pokemon/tapu_bulu/footprint.png and b/graphics/pokemon/tapu_bulu/footprint.png differ diff --git a/graphics/pokemon/tapu_fini/footprint.png b/graphics/pokemon/tapu_fini/footprint.png index 5c9f78a24..2449369fd 100644 Binary files a/graphics/pokemon/tapu_fini/footprint.png and b/graphics/pokemon/tapu_fini/footprint.png differ diff --git a/graphics/pokemon/tapu_koko/footprint.png b/graphics/pokemon/tapu_koko/footprint.png index a3357255c..2449369fd 100644 Binary files a/graphics/pokemon/tapu_koko/footprint.png and b/graphics/pokemon/tapu_koko/footprint.png differ diff --git a/graphics/pokemon/tapu_lele/footprint.png b/graphics/pokemon/tapu_lele/footprint.png index e6058f4c0..2449369fd 100644 Binary files a/graphics/pokemon/tapu_lele/footprint.png and b/graphics/pokemon/tapu_lele/footprint.png differ diff --git a/graphics/pokemon/tauros/footprint.png b/graphics/pokemon/tauros/footprint.png index 602011c6d..3ae3a980d 100644 Binary files a/graphics/pokemon/tauros/footprint.png and b/graphics/pokemon/tauros/footprint.png differ diff --git a/graphics/pokemon/teddiursa/footprint.png b/graphics/pokemon/teddiursa/footprint.png index def88c323..6e0bdfd17 100644 Binary files a/graphics/pokemon/teddiursa/footprint.png and b/graphics/pokemon/teddiursa/footprint.png differ diff --git a/graphics/pokemon/tentacool/footprint.png b/graphics/pokemon/tentacool/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/tentacool/footprint.png and b/graphics/pokemon/tentacool/footprint.png differ diff --git a/graphics/pokemon/tentacruel/footprint.png b/graphics/pokemon/tentacruel/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/tentacruel/footprint.png and b/graphics/pokemon/tentacruel/footprint.png differ diff --git a/graphics/pokemon/tepig/footprint.png b/graphics/pokemon/tepig/footprint.png index a55f788c0..b939dcaa9 100644 Binary files a/graphics/pokemon/tepig/footprint.png and b/graphics/pokemon/tepig/footprint.png differ diff --git a/graphics/pokemon/terrakion/footprint.png b/graphics/pokemon/terrakion/footprint.png index 4337c2e70..555032f2e 100644 Binary files a/graphics/pokemon/terrakion/footprint.png and b/graphics/pokemon/terrakion/footprint.png differ diff --git a/graphics/pokemon/thievul/footprint.png b/graphics/pokemon/thievul/footprint.png index 530e57b35..1e826963e 100644 Binary files a/graphics/pokemon/thievul/footprint.png and b/graphics/pokemon/thievul/footprint.png differ diff --git a/graphics/pokemon/throh/footprint.png b/graphics/pokemon/throh/footprint.png index a2dcc6faa..f93d5482b 100644 Binary files a/graphics/pokemon/throh/footprint.png and b/graphics/pokemon/throh/footprint.png differ diff --git a/graphics/pokemon/thundurus/footprint.png b/graphics/pokemon/thundurus/footprint.png index 694b0c1b7..2449369fd 100644 Binary files a/graphics/pokemon/thundurus/footprint.png and b/graphics/pokemon/thundurus/footprint.png differ diff --git a/graphics/pokemon/thwackey/footprint.png b/graphics/pokemon/thwackey/footprint.png index a39e31bcf..3dba04bc4 100644 Binary files a/graphics/pokemon/thwackey/footprint.png and b/graphics/pokemon/thwackey/footprint.png differ diff --git a/graphics/pokemon/timburr/footprint.png b/graphics/pokemon/timburr/footprint.png index 64485605f..b2b80af66 100644 Binary files a/graphics/pokemon/timburr/footprint.png and b/graphics/pokemon/timburr/footprint.png differ diff --git a/graphics/pokemon/tirtouga/footprint.png b/graphics/pokemon/tirtouga/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/tirtouga/footprint.png and b/graphics/pokemon/tirtouga/footprint.png differ diff --git a/graphics/pokemon/togedemaru/footprint.png b/graphics/pokemon/togedemaru/footprint.png index 980843406..5d01e97d6 100644 Binary files a/graphics/pokemon/togedemaru/footprint.png and b/graphics/pokemon/togedemaru/footprint.png differ diff --git a/graphics/pokemon/togekiss/footprint.png b/graphics/pokemon/togekiss/footprint.png index 4709234d3..f210e3c96 100644 Binary files a/graphics/pokemon/togekiss/footprint.png and b/graphics/pokemon/togekiss/footprint.png differ diff --git a/graphics/pokemon/togepi/footprint.png b/graphics/pokemon/togepi/footprint.png index 84e75101b..cf50fcd8f 100644 Binary files a/graphics/pokemon/togepi/footprint.png and b/graphics/pokemon/togepi/footprint.png differ diff --git a/graphics/pokemon/togetic/footprint.png b/graphics/pokemon/togetic/footprint.png index b15913fa8..239f42d98 100644 Binary files a/graphics/pokemon/togetic/footprint.png and b/graphics/pokemon/togetic/footprint.png differ diff --git a/graphics/pokemon/torchic/footprint.png b/graphics/pokemon/torchic/footprint.png index 955afa82a..4149f9bb1 100644 Binary files a/graphics/pokemon/torchic/footprint.png and b/graphics/pokemon/torchic/footprint.png differ diff --git a/graphics/pokemon/torkoal/footprint.png b/graphics/pokemon/torkoal/footprint.png index 208f3bb77..35facf20e 100644 Binary files a/graphics/pokemon/torkoal/footprint.png and b/graphics/pokemon/torkoal/footprint.png differ diff --git a/graphics/pokemon/tornadus/footprint.png b/graphics/pokemon/tornadus/footprint.png index 694b0c1b7..2449369fd 100644 Binary files a/graphics/pokemon/tornadus/footprint.png and b/graphics/pokemon/tornadus/footprint.png differ diff --git a/graphics/pokemon/torracat/footprint.png b/graphics/pokemon/torracat/footprint.png index 0849f9a91..3f806b400 100644 Binary files a/graphics/pokemon/torracat/footprint.png and b/graphics/pokemon/torracat/footprint.png differ diff --git a/graphics/pokemon/torterra/footprint.png b/graphics/pokemon/torterra/footprint.png index 284d60c4e..71340ac91 100644 Binary files a/graphics/pokemon/torterra/footprint.png and b/graphics/pokemon/torterra/footprint.png differ diff --git a/graphics/pokemon/totodile/footprint.png b/graphics/pokemon/totodile/footprint.png index 210260273..dd3fd2e20 100644 Binary files a/graphics/pokemon/totodile/footprint.png and b/graphics/pokemon/totodile/footprint.png differ diff --git a/graphics/pokemon/toucannon/footprint.png b/graphics/pokemon/toucannon/footprint.png index d85988dbc..4865f1192 100644 Binary files a/graphics/pokemon/toucannon/footprint.png and b/graphics/pokemon/toucannon/footprint.png differ diff --git a/graphics/pokemon/toxapex/footprint.png b/graphics/pokemon/toxapex/footprint.png index 211e447c1..6cb6bad14 100644 Binary files a/graphics/pokemon/toxapex/footprint.png and b/graphics/pokemon/toxapex/footprint.png differ diff --git a/graphics/pokemon/toxel/footprint.png b/graphics/pokemon/toxel/footprint.png index e89659880..9d608f4b9 100644 Binary files a/graphics/pokemon/toxel/footprint.png and b/graphics/pokemon/toxel/footprint.png differ diff --git a/graphics/pokemon/toxicroak/footprint.png b/graphics/pokemon/toxicroak/footprint.png index 50e427cca..ebd2ea045 100644 Binary files a/graphics/pokemon/toxicroak/footprint.png and b/graphics/pokemon/toxicroak/footprint.png differ diff --git a/graphics/pokemon/toxtricity/footprint.png b/graphics/pokemon/toxtricity/footprint.png index f9824a088..50470342a 100644 Binary files a/graphics/pokemon/toxtricity/footprint.png and b/graphics/pokemon/toxtricity/footprint.png differ diff --git a/graphics/pokemon/tranquill/footprint.png b/graphics/pokemon/tranquill/footprint.png index eeb0c0d94..549f607a4 100644 Binary files a/graphics/pokemon/tranquill/footprint.png and b/graphics/pokemon/tranquill/footprint.png differ diff --git a/graphics/pokemon/trapinch/footprint.png b/graphics/pokemon/trapinch/footprint.png index c3e6e785b..be4eeb90e 100644 Binary files a/graphics/pokemon/trapinch/footprint.png and b/graphics/pokemon/trapinch/footprint.png differ diff --git a/graphics/pokemon/treecko/footprint.png b/graphics/pokemon/treecko/footprint.png index ed3854702..695c6a891 100644 Binary files a/graphics/pokemon/treecko/footprint.png and b/graphics/pokemon/treecko/footprint.png differ diff --git a/graphics/pokemon/trevenant/footprint.png b/graphics/pokemon/trevenant/footprint.png index 97e1658e4..2a1c1f3dd 100644 Binary files a/graphics/pokemon/trevenant/footprint.png and b/graphics/pokemon/trevenant/footprint.png differ diff --git a/graphics/pokemon/tropius/footprint.png b/graphics/pokemon/tropius/footprint.png index e6e7e8795..3aaaaaf67 100644 Binary files a/graphics/pokemon/tropius/footprint.png and b/graphics/pokemon/tropius/footprint.png differ diff --git a/graphics/pokemon/trubbish/footprint.png b/graphics/pokemon/trubbish/footprint.png index 9358729f3..cf7fd0e37 100644 Binary files a/graphics/pokemon/trubbish/footprint.png and b/graphics/pokemon/trubbish/footprint.png differ diff --git a/graphics/pokemon/trumbeak/footprint.png b/graphics/pokemon/trumbeak/footprint.png index d31c0fc03..6eeb95023 100644 Binary files a/graphics/pokemon/trumbeak/footprint.png and b/graphics/pokemon/trumbeak/footprint.png differ diff --git a/graphics/pokemon/tsareena/footprint.png b/graphics/pokemon/tsareena/footprint.png index 4a2618262..2a1c1f3dd 100644 Binary files a/graphics/pokemon/tsareena/footprint.png and b/graphics/pokemon/tsareena/footprint.png differ diff --git a/graphics/pokemon/turtonator/footprint.png b/graphics/pokemon/turtonator/footprint.png index ee747e804..bec8f1f1f 100644 Binary files a/graphics/pokemon/turtonator/footprint.png and b/graphics/pokemon/turtonator/footprint.png differ diff --git a/graphics/pokemon/turtwig/footprint.png b/graphics/pokemon/turtwig/footprint.png index 94503f119..0c987616f 100644 Binary files a/graphics/pokemon/turtwig/footprint.png and b/graphics/pokemon/turtwig/footprint.png differ diff --git a/graphics/pokemon/tympole/footprint.png b/graphics/pokemon/tympole/footprint.png index dde2b2638..2449369fd 100644 Binary files a/graphics/pokemon/tympole/footprint.png and b/graphics/pokemon/tympole/footprint.png differ diff --git a/graphics/pokemon/tynamo/footprint.png b/graphics/pokemon/tynamo/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/tynamo/footprint.png and b/graphics/pokemon/tynamo/footprint.png differ diff --git a/graphics/pokemon/type_null/footprint.png b/graphics/pokemon/type_null/footprint.png index 45cac97c9..e01a0a962 100644 Binary files a/graphics/pokemon/type_null/footprint.png and b/graphics/pokemon/type_null/footprint.png differ diff --git a/graphics/pokemon/typhlosion/footprint.png b/graphics/pokemon/typhlosion/footprint.png index 1d4492cf1..989b796e5 100644 Binary files a/graphics/pokemon/typhlosion/footprint.png and b/graphics/pokemon/typhlosion/footprint.png differ diff --git a/graphics/pokemon/tyranitar/footprint.png b/graphics/pokemon/tyranitar/footprint.png index ea12c75b0..c5e6dfdd7 100644 Binary files a/graphics/pokemon/tyranitar/footprint.png and b/graphics/pokemon/tyranitar/footprint.png differ diff --git a/graphics/pokemon/tyrantrum/footprint.png b/graphics/pokemon/tyrantrum/footprint.png index 77ac61310..51ff44438 100644 Binary files a/graphics/pokemon/tyrantrum/footprint.png and b/graphics/pokemon/tyrantrum/footprint.png differ diff --git a/graphics/pokemon/tyrogue/footprint.png b/graphics/pokemon/tyrogue/footprint.png index 0ef849eb8..66cbd8080 100644 Binary files a/graphics/pokemon/tyrogue/footprint.png and b/graphics/pokemon/tyrogue/footprint.png differ diff --git a/graphics/pokemon/tyrunt/footprint.png b/graphics/pokemon/tyrunt/footprint.png index 04157d186..388ad8e13 100644 Binary files a/graphics/pokemon/tyrunt/footprint.png and b/graphics/pokemon/tyrunt/footprint.png differ diff --git a/graphics/pokemon/umbreon/footprint.png b/graphics/pokemon/umbreon/footprint.png index a1d897dc3..97ce7db2b 100644 Binary files a/graphics/pokemon/umbreon/footprint.png and b/graphics/pokemon/umbreon/footprint.png differ diff --git a/graphics/pokemon/unfezant/footprint.png b/graphics/pokemon/unfezant/footprint.png index acc0d15d7..206c9169e 100644 Binary files a/graphics/pokemon/unfezant/footprint.png and b/graphics/pokemon/unfezant/footprint.png differ diff --git a/graphics/pokemon/unown/footprint.png b/graphics/pokemon/unown/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/unown/footprint.png and b/graphics/pokemon/unown/footprint.png differ diff --git a/graphics/pokemon/ursaring/footprint.png b/graphics/pokemon/ursaring/footprint.png index b1023bd3b..c27c42e8c 100644 Binary files a/graphics/pokemon/ursaring/footprint.png and b/graphics/pokemon/ursaring/footprint.png differ diff --git a/graphics/pokemon/urshifu/footprint.png b/graphics/pokemon/urshifu/footprint.png index bf4c5a6f6..067d234cf 100644 Binary files a/graphics/pokemon/urshifu/footprint.png and b/graphics/pokemon/urshifu/footprint.png differ diff --git a/graphics/pokemon/uxie/footprint.png b/graphics/pokemon/uxie/footprint.png index 3d48a802c..f1b5a7a09 100644 Binary files a/graphics/pokemon/uxie/footprint.png and b/graphics/pokemon/uxie/footprint.png differ diff --git a/graphics/pokemon/vanillish/footprint.png b/graphics/pokemon/vanillish/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/vanillish/footprint.png and b/graphics/pokemon/vanillish/footprint.png differ diff --git a/graphics/pokemon/vanillite/footprint.png b/graphics/pokemon/vanillite/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/vanillite/footprint.png and b/graphics/pokemon/vanillite/footprint.png differ diff --git a/graphics/pokemon/vanilluxe/footprint.png b/graphics/pokemon/vanilluxe/footprint.png index aa5f41c38..2449369fd 100644 Binary files a/graphics/pokemon/vanilluxe/footprint.png and b/graphics/pokemon/vanilluxe/footprint.png differ diff --git a/graphics/pokemon/vaporeon/footprint.png b/graphics/pokemon/vaporeon/footprint.png index 2b44d4b24..7e40d8198 100644 Binary files a/graphics/pokemon/vaporeon/footprint.png and b/graphics/pokemon/vaporeon/footprint.png differ diff --git a/graphics/pokemon/venipede/footprint.png b/graphics/pokemon/venipede/footprint.png index 4cc2972cf..2a1c1f3dd 100644 Binary files a/graphics/pokemon/venipede/footprint.png and b/graphics/pokemon/venipede/footprint.png differ diff --git a/graphics/pokemon/venomoth/footprint.png b/graphics/pokemon/venomoth/footprint.png index 6965dbe60..a9b0e33c2 100644 Binary files a/graphics/pokemon/venomoth/footprint.png and b/graphics/pokemon/venomoth/footprint.png differ diff --git a/graphics/pokemon/venonat/footprint.png b/graphics/pokemon/venonat/footprint.png index 3675945c9..f1f332f81 100644 Binary files a/graphics/pokemon/venonat/footprint.png and b/graphics/pokemon/venonat/footprint.png differ diff --git a/graphics/pokemon/venusaur/footprint.png b/graphics/pokemon/venusaur/footprint.png index bdef2c818..188dd9608 100644 Binary files a/graphics/pokemon/venusaur/footprint.png and b/graphics/pokemon/venusaur/footprint.png differ diff --git a/graphics/pokemon/vespiquen/footprint.png b/graphics/pokemon/vespiquen/footprint.png index 285e15672..2449369fd 100644 Binary files a/graphics/pokemon/vespiquen/footprint.png and b/graphics/pokemon/vespiquen/footprint.png differ diff --git a/graphics/pokemon/vibrava/footprint.png b/graphics/pokemon/vibrava/footprint.png index fdf76f9f2..b935f853a 100644 Binary files a/graphics/pokemon/vibrava/footprint.png and b/graphics/pokemon/vibrava/footprint.png differ diff --git a/graphics/pokemon/victini/footprint.png b/graphics/pokemon/victini/footprint.png index 3b24bcd92..907babd2d 100644 Binary files a/graphics/pokemon/victini/footprint.png and b/graphics/pokemon/victini/footprint.png differ diff --git a/graphics/pokemon/victreebel/footprint.png b/graphics/pokemon/victreebel/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/victreebel/footprint.png and b/graphics/pokemon/victreebel/footprint.png differ diff --git a/graphics/pokemon/vigoroth/footprint.png b/graphics/pokemon/vigoroth/footprint.png index bc10a7230..8a39db031 100644 Binary files a/graphics/pokemon/vigoroth/footprint.png and b/graphics/pokemon/vigoroth/footprint.png differ diff --git a/graphics/pokemon/vikavolt/footprint.png b/graphics/pokemon/vikavolt/footprint.png index bc9bf4168..d023f20ee 100644 Binary files a/graphics/pokemon/vikavolt/footprint.png and b/graphics/pokemon/vikavolt/footprint.png differ diff --git a/graphics/pokemon/vileplume/footprint.png b/graphics/pokemon/vileplume/footprint.png index 8fd5bdf83..ba0d3fca8 100644 Binary files a/graphics/pokemon/vileplume/footprint.png and b/graphics/pokemon/vileplume/footprint.png differ diff --git a/graphics/pokemon/virizion/footprint.png b/graphics/pokemon/virizion/footprint.png index 147ff0962..ec92663f9 100644 Binary files a/graphics/pokemon/virizion/footprint.png and b/graphics/pokemon/virizion/footprint.png differ diff --git a/graphics/pokemon/vivillon/footprint.png b/graphics/pokemon/vivillon/footprint.png index bc51948b8..2449369fd 100644 Binary files a/graphics/pokemon/vivillon/footprint.png and b/graphics/pokemon/vivillon/footprint.png differ diff --git a/graphics/pokemon/volbeat/footprint.png b/graphics/pokemon/volbeat/footprint.png index 916c59f60..f5df06fdc 100644 Binary files a/graphics/pokemon/volbeat/footprint.png and b/graphics/pokemon/volbeat/footprint.png differ diff --git a/graphics/pokemon/volcanion/footprint.png b/graphics/pokemon/volcanion/footprint.png index 3ad867116..86218af32 100644 Binary files a/graphics/pokemon/volcanion/footprint.png and b/graphics/pokemon/volcanion/footprint.png differ diff --git a/graphics/pokemon/volcarona/footprint.png b/graphics/pokemon/volcarona/footprint.png index 694b0c1b7..2449369fd 100644 Binary files a/graphics/pokemon/volcarona/footprint.png and b/graphics/pokemon/volcarona/footprint.png differ diff --git a/graphics/pokemon/voltorb/footprint.png b/graphics/pokemon/voltorb/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/voltorb/footprint.png and b/graphics/pokemon/voltorb/footprint.png differ diff --git a/graphics/pokemon/vullaby/footprint.png b/graphics/pokemon/vullaby/footprint.png index db19aa1bb..060796e10 100644 Binary files a/graphics/pokemon/vullaby/footprint.png and b/graphics/pokemon/vullaby/footprint.png differ diff --git a/graphics/pokemon/vulpix/footprint.png b/graphics/pokemon/vulpix/footprint.png index a0a655ca6..064b2bcf7 100644 Binary files a/graphics/pokemon/vulpix/footprint.png and b/graphics/pokemon/vulpix/footprint.png differ diff --git a/graphics/pokemon/wailmer/footprint.png b/graphics/pokemon/wailmer/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/wailmer/footprint.png and b/graphics/pokemon/wailmer/footprint.png differ diff --git a/graphics/pokemon/wailord/footprint.png b/graphics/pokemon/wailord/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/wailord/footprint.png and b/graphics/pokemon/wailord/footprint.png differ diff --git a/graphics/pokemon/walrein/footprint.png b/graphics/pokemon/walrein/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/walrein/footprint.png and b/graphics/pokemon/walrein/footprint.png differ diff --git a/graphics/pokemon/wartortle/footprint.png b/graphics/pokemon/wartortle/footprint.png index 4dd126496..948a3c86a 100644 Binary files a/graphics/pokemon/wartortle/footprint.png and b/graphics/pokemon/wartortle/footprint.png differ diff --git a/graphics/pokemon/watchog/footprint.png b/graphics/pokemon/watchog/footprint.png index 553c2782c..0f65ec545 100644 Binary files a/graphics/pokemon/watchog/footprint.png and b/graphics/pokemon/watchog/footprint.png differ diff --git a/graphics/pokemon/weavile/footprint.png b/graphics/pokemon/weavile/footprint.png index 03d2b626b..2f3dd915d 100644 Binary files a/graphics/pokemon/weavile/footprint.png and b/graphics/pokemon/weavile/footprint.png differ diff --git a/graphics/pokemon/weedle/footprint.png b/graphics/pokemon/weedle/footprint.png index c1c0058e7..2a1c1f3dd 100644 Binary files a/graphics/pokemon/weedle/footprint.png and b/graphics/pokemon/weedle/footprint.png differ diff --git a/graphics/pokemon/weepinbell/footprint.png b/graphics/pokemon/weepinbell/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/weepinbell/footprint.png and b/graphics/pokemon/weepinbell/footprint.png differ diff --git a/graphics/pokemon/weezing/footprint.png b/graphics/pokemon/weezing/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/weezing/footprint.png and b/graphics/pokemon/weezing/footprint.png differ diff --git a/graphics/pokemon/whimsicott/footprint.png b/graphics/pokemon/whimsicott/footprint.png index 4cc2972cf..2a1c1f3dd 100644 Binary files a/graphics/pokemon/whimsicott/footprint.png and b/graphics/pokemon/whimsicott/footprint.png differ diff --git a/graphics/pokemon/whirlipede/footprint.png b/graphics/pokemon/whirlipede/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/whirlipede/footprint.png and b/graphics/pokemon/whirlipede/footprint.png differ diff --git a/graphics/pokemon/whiscash/footprint.png b/graphics/pokemon/whiscash/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/whiscash/footprint.png and b/graphics/pokemon/whiscash/footprint.png differ diff --git a/graphics/pokemon/whismur/footprint.png b/graphics/pokemon/whismur/footprint.png index a2ad42b4c..a3a49ad7c 100644 Binary files a/graphics/pokemon/whismur/footprint.png and b/graphics/pokemon/whismur/footprint.png differ diff --git a/graphics/pokemon/wigglytuff/footprint.png b/graphics/pokemon/wigglytuff/footprint.png index 68ce8eda3..d563a2417 100644 Binary files a/graphics/pokemon/wigglytuff/footprint.png and b/graphics/pokemon/wigglytuff/footprint.png differ diff --git a/graphics/pokemon/wimpod/footprint.png b/graphics/pokemon/wimpod/footprint.png index 9e61a6530..2a1c1f3dd 100644 Binary files a/graphics/pokemon/wimpod/footprint.png and b/graphics/pokemon/wimpod/footprint.png differ diff --git a/graphics/pokemon/wingull/footprint.png b/graphics/pokemon/wingull/footprint.png index 057b2cefa..26b410ad3 100644 Binary files a/graphics/pokemon/wingull/footprint.png and b/graphics/pokemon/wingull/footprint.png differ diff --git a/graphics/pokemon/wishiwashi/footprint.png b/graphics/pokemon/wishiwashi/footprint.png index 2d3e0d134..2449369fd 100644 Binary files a/graphics/pokemon/wishiwashi/footprint.png and b/graphics/pokemon/wishiwashi/footprint.png differ diff --git a/graphics/pokemon/wobbuffet/footprint.png b/graphics/pokemon/wobbuffet/footprint.png index 49fa6818d..b7d2324d2 100644 Binary files a/graphics/pokemon/wobbuffet/footprint.png and b/graphics/pokemon/wobbuffet/footprint.png differ diff --git a/graphics/pokemon/woobat/footprint.png b/graphics/pokemon/woobat/footprint.png index dde2b2638..2449369fd 100644 Binary files a/graphics/pokemon/woobat/footprint.png and b/graphics/pokemon/woobat/footprint.png differ diff --git a/graphics/pokemon/wooloo/footprint.png b/graphics/pokemon/wooloo/footprint.png index 7c44b00b0..fbe404e97 100644 Binary files a/graphics/pokemon/wooloo/footprint.png and b/graphics/pokemon/wooloo/footprint.png differ diff --git a/graphics/pokemon/wooper/footprint.png b/graphics/pokemon/wooper/footprint.png index 5e1ba56e6..22911aa46 100644 Binary files a/graphics/pokemon/wooper/footprint.png and b/graphics/pokemon/wooper/footprint.png differ diff --git a/graphics/pokemon/wormadam/plant/footprint.png b/graphics/pokemon/wormadam/plant/footprint.png index 285e15672..2449369fd 100644 Binary files a/graphics/pokemon/wormadam/plant/footprint.png and b/graphics/pokemon/wormadam/plant/footprint.png differ diff --git a/graphics/pokemon/wurmple/footprint.png b/graphics/pokemon/wurmple/footprint.png index 3ac4abd9f..bbb7102f6 100644 Binary files a/graphics/pokemon/wurmple/footprint.png and b/graphics/pokemon/wurmple/footprint.png differ diff --git a/graphics/pokemon/wynaut/footprint.png b/graphics/pokemon/wynaut/footprint.png index 4fe4832c0..6b0daca37 100644 Binary files a/graphics/pokemon/wynaut/footprint.png and b/graphics/pokemon/wynaut/footprint.png differ diff --git a/graphics/pokemon/xatu/footprint.png b/graphics/pokemon/xatu/footprint.png index 44fcad1e3..52be00008 100644 Binary files a/graphics/pokemon/xatu/footprint.png and b/graphics/pokemon/xatu/footprint.png differ diff --git a/graphics/pokemon/xerneas/footprint.png b/graphics/pokemon/xerneas/footprint.png index d66c01256..2a1c1f3dd 100644 Binary files a/graphics/pokemon/xerneas/footprint.png and b/graphics/pokemon/xerneas/footprint.png differ diff --git a/graphics/pokemon/xurkitree/footprint.png b/graphics/pokemon/xurkitree/footprint.png index 09228b878..822e298f1 100644 Binary files a/graphics/pokemon/xurkitree/footprint.png and b/graphics/pokemon/xurkitree/footprint.png differ diff --git a/graphics/pokemon/yamask/footprint.png b/graphics/pokemon/yamask/footprint.png index 4aee2c648..2449369fd 100644 Binary files a/graphics/pokemon/yamask/footprint.png and b/graphics/pokemon/yamask/footprint.png differ diff --git a/graphics/pokemon/yamper/footprint.png b/graphics/pokemon/yamper/footprint.png index 4324de5e4..793daaba5 100644 Binary files a/graphics/pokemon/yamper/footprint.png and b/graphics/pokemon/yamper/footprint.png differ diff --git a/graphics/pokemon/yanma/footprint.png b/graphics/pokemon/yanma/footprint.png index 20b4a00b0..fc45b68cf 100644 Binary files a/graphics/pokemon/yanma/footprint.png and b/graphics/pokemon/yanma/footprint.png differ diff --git a/graphics/pokemon/yanmega/footprint.png b/graphics/pokemon/yanmega/footprint.png index ae5e4f6f7..eaa8855b8 100644 Binary files a/graphics/pokemon/yanmega/footprint.png and b/graphics/pokemon/yanmega/footprint.png differ diff --git a/graphics/pokemon/yungoos/footprint.png b/graphics/pokemon/yungoos/footprint.png index bf93269ca..2f8e0312a 100644 Binary files a/graphics/pokemon/yungoos/footprint.png and b/graphics/pokemon/yungoos/footprint.png differ diff --git a/graphics/pokemon/yveltal/footprint.png b/graphics/pokemon/yveltal/footprint.png index 0f8d4fd8b..1016b31bc 100644 Binary files a/graphics/pokemon/yveltal/footprint.png and b/graphics/pokemon/yveltal/footprint.png differ diff --git a/graphics/pokemon/zacian/footprint.png b/graphics/pokemon/zacian/footprint.png index eeb3f0ca6..93ac3a9f8 100644 Binary files a/graphics/pokemon/zacian/footprint.png and b/graphics/pokemon/zacian/footprint.png differ diff --git a/graphics/pokemon/zamazenta/footprint.png b/graphics/pokemon/zamazenta/footprint.png index 242a33ad6..baca07e79 100644 Binary files a/graphics/pokemon/zamazenta/footprint.png and b/graphics/pokemon/zamazenta/footprint.png differ diff --git a/graphics/pokemon/zangoose/footprint.png b/graphics/pokemon/zangoose/footprint.png index e07e58cee..cc43fe917 100644 Binary files a/graphics/pokemon/zangoose/footprint.png and b/graphics/pokemon/zangoose/footprint.png differ diff --git a/graphics/pokemon/zapdos/footprint.png b/graphics/pokemon/zapdos/footprint.png index 480063a88..80b07a5b0 100644 Binary files a/graphics/pokemon/zapdos/footprint.png and b/graphics/pokemon/zapdos/footprint.png differ diff --git a/graphics/pokemon/zarude/footprint.png b/graphics/pokemon/zarude/footprint.png index 3e1c2c2fd..8a04084f2 100644 Binary files a/graphics/pokemon/zarude/footprint.png and b/graphics/pokemon/zarude/footprint.png differ diff --git a/graphics/pokemon/zebstrika/footprint.png b/graphics/pokemon/zebstrika/footprint.png index e169cc9fb..e88ea3a94 100644 Binary files a/graphics/pokemon/zebstrika/footprint.png and b/graphics/pokemon/zebstrika/footprint.png differ diff --git a/graphics/pokemon/zekrom/footprint.png b/graphics/pokemon/zekrom/footprint.png index e93444fa0..8f1317095 100644 Binary files a/graphics/pokemon/zekrom/footprint.png and b/graphics/pokemon/zekrom/footprint.png differ diff --git a/graphics/pokemon/zeraora/footprint.png b/graphics/pokemon/zeraora/footprint.png index 3d73d15e4..f733f0490 100644 Binary files a/graphics/pokemon/zeraora/footprint.png and b/graphics/pokemon/zeraora/footprint.png differ diff --git a/graphics/pokemon/zigzagoon/footprint.png b/graphics/pokemon/zigzagoon/footprint.png index d7373e064..421b25991 100644 Binary files a/graphics/pokemon/zigzagoon/footprint.png and b/graphics/pokemon/zigzagoon/footprint.png differ diff --git a/graphics/pokemon/zoroark/footprint.png b/graphics/pokemon/zoroark/footprint.png index e203679b9..86ba3e3d1 100644 Binary files a/graphics/pokemon/zoroark/footprint.png and b/graphics/pokemon/zoroark/footprint.png differ diff --git a/graphics/pokemon/zorua/footprint.png b/graphics/pokemon/zorua/footprint.png index 370ee0d78..115802fa8 100644 Binary files a/graphics/pokemon/zorua/footprint.png and b/graphics/pokemon/zorua/footprint.png differ diff --git a/graphics/pokemon/zubat/footprint.png b/graphics/pokemon/zubat/footprint.png index c7ccf57f3..2449369fd 100644 Binary files a/graphics/pokemon/zubat/footprint.png and b/graphics/pokemon/zubat/footprint.png differ diff --git a/graphics/pokemon/zweilous/footprint.png b/graphics/pokemon/zweilous/footprint.png index 222daa341..c010b942d 100644 Binary files a/graphics/pokemon/zweilous/footprint.png and b/graphics/pokemon/zweilous/footprint.png differ diff --git a/graphics/pokemon/zygarde/footprint.png b/graphics/pokemon/zygarde/footprint.png index 36541a36f..1bea4058a 100644 Binary files a/graphics/pokemon/zygarde/footprint.png and b/graphics/pokemon/zygarde/footprint.png differ diff --git a/graphics/spinda_spots/spot_0.bin b/graphics/spinda_spots/spot_0.bin deleted file mode 100644 index 938d1d592..000000000 Binary files a/graphics/spinda_spots/spot_0.bin and /dev/null differ diff --git a/graphics/spinda_spots/spot_0.png b/graphics/spinda_spots/spot_0.png new file mode 100644 index 000000000..e0a515d77 Binary files /dev/null and b/graphics/spinda_spots/spot_0.png differ diff --git a/graphics/spinda_spots/spot_1.bin b/graphics/spinda_spots/spot_1.bin deleted file mode 100644 index db46b5de4..000000000 Binary files a/graphics/spinda_spots/spot_1.bin and /dev/null differ diff --git a/graphics/spinda_spots/spot_1.png b/graphics/spinda_spots/spot_1.png new file mode 100644 index 000000000..0e7fbd399 Binary files /dev/null and b/graphics/spinda_spots/spot_1.png differ diff --git a/graphics/spinda_spots/spot_2.bin b/graphics/spinda_spots/spot_2.bin deleted file mode 100644 index 3b1bf7214..000000000 Binary files a/graphics/spinda_spots/spot_2.bin and /dev/null differ diff --git a/graphics/spinda_spots/spot_2.png b/graphics/spinda_spots/spot_2.png new file mode 100644 index 000000000..9bf72bd8c Binary files /dev/null and b/graphics/spinda_spots/spot_2.png differ diff --git a/graphics/spinda_spots/spot_3.bin b/graphics/spinda_spots/spot_3.bin deleted file mode 100644 index 10c73f9ba..000000000 Binary files a/graphics/spinda_spots/spot_3.bin and /dev/null differ diff --git a/graphics/spinda_spots/spot_3.png b/graphics/spinda_spots/spot_3.png new file mode 100644 index 000000000..cf4a96f7d Binary files /dev/null and b/graphics/spinda_spots/spot_3.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 56ceb4f4d..cfe5c6257 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -22,6 +22,7 @@ JPCONTESTGFXDIR := graphics/contest/japanese POKEDEXGFXDIR := graphics/pokedex STARTERGFXDIR := graphics/starter_choose NAMINGGFXDIR := graphics/naming_screen +SPINDAGFXDIR := graphics/spinda_spots types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy contest_types := cool beauty cute smart tough @@ -699,3 +700,15 @@ $(NAMINGGFXDIR)/cursor_squished.4bpp: %.4bpp: %.png $(NAMINGGFXDIR)/cursor_filled.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 5 -Wnum_tiles + +$(SPINDAGFXDIR)/spot_0.1bpp: %.1bpp: %.png + $(GFX) $< $@ -plain -data_width 2 + +$(SPINDAGFXDIR)/spot_1.1bpp: %.1bpp: %.png + $(GFX) $< $@ -plain -data_width 2 + +$(SPINDAGFXDIR)/spot_2.1bpp: %.1bpp: %.png + $(GFX) $< $@ -plain -data_width 2 + +$(SPINDAGFXDIR)/spot_3.1bpp: %.1bpp: %.png + $(GFX) $< $@ -plain -data_width 2 diff --git a/include/gba/defines.h b/include/gba/defines.h index 9959a17ef..fbe0a6070 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -30,14 +30,12 @@ #define IWRAM_START 0x03000000 #define IWRAM_END (IWRAM_START + 0x8000) -#define PLTT 0x5000000 -#define PLTT_SIZE 0x400 - -#define BG_PLTT PLTT -#define BG_PLTT_SIZE 0x200 - -#define OBJ_PLTT (PLTT + 0x200) +#define PLTT 0x5000000 +#define BG_PLTT PLTT +#define BG_PLTT_SIZE 0x200 +#define OBJ_PLTT (PLTT + BG_PLTT_SIZE) #define OBJ_PLTT_SIZE 0x200 +#define PLTT_SIZE (BG_PLTT_SIZE + OBJ_PLTT_SIZE) #define VRAM 0x6000000 #define VRAM_SIZE 0x18000 @@ -67,14 +65,23 @@ #define ROM_HEADER_SIZE 0xC0 +// Dimensions of a tile in pixels +#define TILE_WIDTH 8 +#define TILE_HEIGHT 8 + +// Dimensions of the GBA screen in pixels #define DISPLAY_WIDTH 240 #define DISPLAY_HEIGHT 160 -#define DISPLAY_TILE_WIDTH (DISPLAY_WIDTH / 8) -#define DISPLAY_TILE_HEIGHT (DISPLAY_HEIGHT / 8) +// Dimensions of the GBA screen in tiles +#define DISPLAY_TILE_WIDTH (DISPLAY_WIDTH / TILE_WIDTH) +#define DISPLAY_TILE_HEIGHT (DISPLAY_HEIGHT / TILE_HEIGHT) -#define TILE_SIZE_4BPP 32 -#define TILE_SIZE_8BPP 64 +// Size of different tile formats in bytes +#define TILE_SIZE(bpp)((bpp) * TILE_WIDTH * TILE_HEIGHT / 8) +#define TILE_SIZE_1BPP TILE_SIZE(1) // 8 +#define TILE_SIZE_4BPP TILE_SIZE(4) // 32 +#define TILE_SIZE_8BPP TILE_SIZE(8) // 64 #define TILE_OFFSET_4BPP(n) ((n) * TILE_SIZE_4BPP) #define TILE_OFFSET_8BPP(n) ((n) * TILE_SIZE_8BPP) diff --git a/include/palette.h b/include/palette.h index 29723ef6c..d23a658b4 100644 --- a/include/palette.h +++ b/include/palette.h @@ -6,8 +6,7 @@ #define gPaletteFade_delay (gPaletteFade.multipurpose2) // normal and hardware fade #define gPaletteFade_submode (gPaletteFade.multipurpose2) // fast fade -#define PLTT_BUFFER_SIZE 0x200 -#define PLTT_DECOMP_BUFFER_SIZE (PLTT_BUFFER_SIZE * 2) +#define PLTT_BUFFER_SIZE (PLTT_SIZE / sizeof(u16)) #define PALETTE_FADE_STATUS_DELAY 2 #define PALETTE_FADE_STATUS_ACTIVE 1 diff --git a/src/battle_anim.c b/src/battle_anim.c index 3732d0251..f051fc7fa 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1080,27 +1080,15 @@ static void Task_UpdateMonBg(u8 taskId) if (!gTasks[taskId].t2_InBg2) { - u16 *src; - u16 *dst; - gBattle_BG1_X = x + gTasks[taskId].t2_BgX; gBattle_BG1_Y = y + gTasks[taskId].t2_BgY; - - src = &gPlttBufferFaded[0x100 + battlerId * 16]; - dst = &gPlttBufferFaded[0x100 + animBg.paletteId * 16 - 256]; - CpuCopy32(src, dst, 32); + CpuCopy32(&gPlttBufferFaded[OBJ_PLTT_ID(battlerId)], &gPlttBufferFaded[BG_PLTT_ID(animBg.paletteId)], PLTT_SIZE_4BPP); } else { - u16 *src; - u16 *dst; - gBattle_BG2_X = x + gTasks[taskId].t2_BgX; gBattle_BG2_Y = y + gTasks[taskId].t2_BgY; - - src = &gPlttBufferFaded[0x100 + battlerId * 16]; - dst = &gPlttBufferFaded[0x100 - 112]; - CpuCopy32(src, dst, 32); + CpuCopy32(&gPlttBufferFaded[OBJ_PLTT_ID(battlerId)], &gPlttBufferFaded[BG_PLTT_ID(9)], PLTT_SIZE_4BPP); } } diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 8dae62029..a9111bce3 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -5116,7 +5116,7 @@ static void AnimProtect(struct Sprite *sprite) sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = (IndexOfSpritePaletteTag(ANIM_TAG_PROTECT) << 4) + 0x100; + sprite->data[2] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(ANIM_TAG_PROTECT)); sprite->data[7] = 16; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - sprite->data[7], sprite->data[7])); @@ -6404,7 +6404,7 @@ void AnimTask_MusicNotesRainbowBlend(u8 taskId) index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[0][0]); if (index != 0xFF) { - index = (index << 4) + 0x100; + index = OBJ_PLTT_ID(index); for (i = 1; i < ARRAY_COUNT(gParticlesColorBlendTable[0]); i++) gPlttBufferFaded[index + i] = gParticlesColorBlendTable[0][i]; } @@ -6414,7 +6414,7 @@ void AnimTask_MusicNotesRainbowBlend(u8 taskId) index = AllocSpritePalette(gParticlesColorBlendTable[j][0]); if (index != 0xFF) { - index = (index << 4) + 0x100; + index = OBJ_PLTT_ID(index); for (i = 1; i < ARRAY_COUNT(gParticlesColorBlendTable[0]); i++) gPlttBufferFaded[index + i] = gParticlesColorBlendTable[j][i]; } diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index f9879583a..b3aedb300 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1787,7 +1787,7 @@ void AnimTask_AirCutterProjectile(u8 taskId) static void AnimVoidLines(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, FALSE); - sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(sVoidLinesSpriteTemplate.paletteTag) << 4); + sprite->data[0] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(sVoidLinesSpriteTemplate.paletteTag)); sprite->callback = AnimVoidLines_Step; } diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 4e510c59c..513a992fe 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1465,11 +1465,11 @@ static void SetPsychicBackground_Step(u8 taskId) if (++gTasks[taskId].data[5] == 4) { - lastColor = gPlttBufferFaded[paletteIndex * 16 + 11]; + lastColor = gPlttBufferFaded[BG_PLTT_ID(paletteIndex) + 11]; for (i = 10; i > 0; i--) - gPlttBufferFaded[paletteIndex * 16 + i + 1] = gPlttBufferFaded[paletteIndex * 16 + i]; + gPlttBufferFaded[BG_PLTT_ID(paletteIndex) + i + 1] = gPlttBufferFaded[BG_PLTT_ID(paletteIndex) + i]; - gPlttBufferFaded[paletteIndex * 16 + 1] = lastColor; + gPlttBufferFaded[BG_PLTT_ID(paletteIndex) + 1] = lastColor; gTasks[taskId].data[5] = 0; } @@ -1491,15 +1491,15 @@ static void FadeScreenToWhite_Step(u8 taskId) if (++gTasks[taskId].data[5] == 4) { - lastColor = gPlttBufferFaded[paletteIndex * 16 + 11]; + lastColor = gPlttBufferFaded[BG_PLTT_ID(paletteIndex) + 11]; for (i = 10; i > 0; i--) - gPlttBufferFaded[paletteIndex * 16 + i + 1] = gPlttBufferFaded[paletteIndex * 16 + i]; - gPlttBufferFaded[paletteIndex * 16 + 1] = lastColor; + gPlttBufferFaded[BG_PLTT_ID(paletteIndex) + i + 1] = gPlttBufferFaded[BG_PLTT_ID(paletteIndex) + i]; + gPlttBufferFaded[BG_PLTT_ID(paletteIndex) + 1] = lastColor; - lastColor = gPlttBufferUnfaded[paletteIndex * 16 + 11]; + lastColor = gPlttBufferUnfaded[BG_PLTT_ID(paletteIndex) + 11]; for (i = 10; i > 0; i--) - gPlttBufferUnfaded[paletteIndex * 16 + i + 1] = gPlttBufferUnfaded[paletteIndex * 16 + i]; - gPlttBufferUnfaded[paletteIndex * 16 + 1] = lastColor; + gPlttBufferUnfaded[BG_PLTT_ID(paletteIndex) + i + 1] = gPlttBufferUnfaded[BG_PLTT_ID(paletteIndex) + i]; + gPlttBufferUnfaded[BG_PLTT_ID(paletteIndex) + 1] = lastColor; gTasks[taskId].data[5] = 0; } diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c index 2735ea447..f595de962 100644 --- a/src/battle_anim_flying.c +++ b/src/battle_anim_flying.c @@ -383,17 +383,17 @@ static void AnimTask_AnimateGustTornadoPalette_Step(u8 taskId) { gTasks[taskId].data[10] = 0; data2 = gTasks[taskId].data[2]; - temp = gPlttBufferFaded[16 * data2 + 0x108]; + temp = gPlttBufferFaded[OBJ_PLTT_ID(data2) + 8]; i = 7; - base = data2 * 16; + base = PLTT_ID(data2); do { - gPlttBufferFaded[base + 0x101 + i] = gPlttBufferFaded[base + 0x100 + i]; + gPlttBufferFaded[base + OBJ_PLTT_OFFSET + 1 + i] = gPlttBufferFaded[base + OBJ_PLTT_OFFSET + i]; i--; } while (i > 0); - gPlttBufferFaded[base + 0x101] = temp; + gPlttBufferFaded[base + OBJ_PLTT_OFFSET + 1] = temp; } if (--gTasks[taskId].data[0] == 0) diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c index bf2c6a42b..870c83f60 100644 --- a/src/battle_anim_ghost.c +++ b/src/battle_anim_ghost.c @@ -693,7 +693,7 @@ static void AnimTask_SpiteTargetShadow_Step1(u8 taskId) task->data[2] = 0; task->data[3] = 16; task->data[13] = GetAnimBattlerSpriteId(ANIM_TARGET); - task->data[4] = (gSprites[task->data[13]].oam.paletteNum + 16) * 16; + task->data[4] = OBJ_PLTT_ID2(gSprites[task->data[13]].oam.paletteNum); if (position == 1) { u16 mask = DISPCNT_BG1_ON; mask2 = mask; diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 7f38da7cb..ca338791c 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -1415,18 +1415,17 @@ void SetGrayscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor) struct PlttData *originalColor; struct PlttData *destColor; u16 average; - - paletteNum *= 16; + u16 paletteOffset = PLTT_ID(paletteNum); if (!restoreOriginalColor) { for (i = 0; i < 16; i++) { - originalColor = (struct PlttData *)&gPlttBufferUnfaded[paletteNum + i]; + originalColor = (struct PlttData *)&gPlttBufferUnfaded[paletteOffset + i]; average = originalColor->r + originalColor->g + originalColor->b; average /= 3; - destColor = (struct PlttData *)&gPlttBufferFaded[paletteNum + i]; + destColor = (struct PlttData *)&gPlttBufferFaded[paletteOffset + i]; destColor->r = average; destColor->g = average; destColor->b = average; @@ -1434,7 +1433,7 @@ void SetGrayscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor) } else { - CpuCopy32(&gPlttBufferUnfaded[paletteNum], &gPlttBufferFaded[paletteNum], 32); + CpuCopy32(&gPlttBufferUnfaded[paletteOffset], &gPlttBufferFaded[paletteOffset], PLTT_SIZE_4BPP); } } diff --git a/src/battle_anim_psychic.c b/src/battle_anim_psychic.c index 2ec5b2600..1c998e9c5 100644 --- a/src/battle_anim_psychic.c +++ b/src/battle_anim_psychic.c @@ -585,7 +585,7 @@ static void AnimDefensiveWall(struct Sprite *sprite) sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + gBattleAnimArgs[1]; } - sprite->data[0] = 256 + IndexOfSpritePaletteTag(gBattleAnimArgs[2]) * 16; + sprite->data[0] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(gBattleAnimArgs[2])); if (isContest) { diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c index 0111b4d6d..da5cd346e 100644 --- a/src/battle_anim_status_effects.c +++ b/src/battle_anim_status_effects.c @@ -442,10 +442,10 @@ static void AnimTask_FrozenIceCube_Step2(u8 taskId) { u16 temp; - temp = gPlttBufferFaded[0x100 + palIndex * 16 + 13]; - gPlttBufferFaded[0x100 + palIndex * 16 + 13] = gPlttBufferFaded[0x100 + palIndex * 16 + 14]; - gPlttBufferFaded[0x100 + palIndex * 16 + 14] = gPlttBufferFaded[0x100 + palIndex * 16 + 15]; - gPlttBufferFaded[0x100 + palIndex * 16 + 15] = temp; + temp = gPlttBufferFaded[OBJ_PLTT_ID(palIndex) + 13]; + gPlttBufferFaded[OBJ_PLTT_ID(palIndex) + 13] = gPlttBufferFaded[OBJ_PLTT_ID(palIndex) + 14]; + gPlttBufferFaded[OBJ_PLTT_ID(palIndex) + 14] = gPlttBufferFaded[OBJ_PLTT_ID(palIndex) + 15]; + gPlttBufferFaded[OBJ_PLTT_ID(palIndex) + 15] = temp; gTasks[taskId].data[2] = 0; gTasks[taskId].data[3]++; diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index b946cc050..4885a7ef3 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -664,7 +664,7 @@ static void SetPalettesToColor(u32 selectedPalettes, u16 color) { if (selectedPalettes & 1) { - u16 curOffset = i * 16; + u16 curOffset = PLTT_ID(i); u16 paletteOffset = curOffset; while (curOffset < paletteOffset + 16) { @@ -939,7 +939,7 @@ void AnimTask_CopyPalUnfadedToBackup(u8 taskId) paletteIndex = gBattleAnimTarget + 16; } - memcpy(&gMonSpritesGfxPtr->buffer[gBattleAnimArgs[1] * 16], &gPlttBufferUnfaded[paletteIndex * 16], 32); + memcpy(&gMonSpritesGfxPtr->buffer[gBattleAnimArgs[1] * 16], &gPlttBufferUnfaded[PLTT_ID(paletteIndex)], PLTT_SIZE_4BPP); DestroyAnimVisualTask(taskId); } @@ -966,7 +966,7 @@ void AnimTask_CopyPalUnfadedFromBackup(u8 taskId) paletteIndex = gBattleAnimTarget + 16; } - memcpy(&gPlttBufferUnfaded[paletteIndex * 16], &gMonSpritesGfxPtr->buffer[gBattleAnimArgs[1] * 16], 32); + memcpy(&gPlttBufferUnfaded[PLTT_ID(paletteIndex)], &gMonSpritesGfxPtr->buffer[gBattleAnimArgs[1] * 16], PLTT_SIZE_4BPP); DestroyAnimVisualTask(taskId); } @@ -993,7 +993,7 @@ void AnimTask_CopyPalFadedToUnfaded(u8 taskId) paletteIndex = gBattleAnimTarget + 16; } - memcpy(&gPlttBufferUnfaded[paletteIndex * 16], &gPlttBufferFaded[paletteIndex * 16], 32); + memcpy(&gPlttBufferUnfaded[PLTT_ID(paletteIndex)], &gPlttBufferFaded[PLTT_ID(paletteIndex)], PLTT_SIZE_4BPP); DestroyAnimVisualTask(taskId); } diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c index a82398ce2..961f154ba 100644 --- a/src/battle_anim_water.c +++ b/src/battle_anim_water.c @@ -778,7 +778,7 @@ static void AnimAuroraBeamRings_Step(struct Sprite *sprite) void AnimTask_RotateAuroraRingColors(u8 taskId) { gTasks[taskId].data[0] = gBattleAnimArgs[0]; - gTasks[taskId].data[2] = IndexOfSpritePaletteTag(ANIM_TAG_RAINBOW_RINGS) * 16 + 256; + gTasks[taskId].data[2] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(ANIM_TAG_RAINBOW_RINGS)); gTasks[taskId].func = AnimTask_RotateAuroraRingColors_Step; } @@ -1080,12 +1080,12 @@ static void AnimTask_CreateSurfWave_Step1(u8 taskId) gTasks[taskId].data[2] += gTasks[taskId].data[1]; if (++gTasks[taskId].data[5] == 4) { - rgbBuffer = gPlttBufferFaded[animBg.paletteId * 16 + 7]; + rgbBuffer = gPlttBufferFaded[BG_PLTT_ID(animBg.paletteId) + 7]; for (i = 6; i != 0; i--) { - gPlttBufferFaded[animBg.paletteId * 16 + 1 + i] = gPlttBufferFaded[animBg.paletteId * 16 + 1 + i - 1]; // 1 + i - 1 is needed to match for some bizarre reason + gPlttBufferFaded[BG_PLTT_ID(animBg.paletteId) + 1 + i] = gPlttBufferFaded[BG_PLTT_ID(animBg.paletteId) + 1 + i - 1]; // 1 + i - 1 is needed to match for some bizarre reason } - gPlttBufferFaded[animBg.paletteId * 16 + 1] = rgbBuffer; + gPlttBufferFaded[BG_PLTT_ID(animBg.paletteId) + 1] = rgbBuffer; gTasks[taskId].data[5] = 0; } if (++gTasks[taskId].data[6] > 1) diff --git a/src/battle_bg.c b/src/battle_bg.c index 0ed1eec2e..b3fea1a20 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -22,6 +22,7 @@ #include "trig.h" #include "window.h" #include "constants/map_types.h" +#include "constants/rgb.h" #include "constants/songs.h" #include "constants/trainers.h" #include "constants/battle_anim.h" @@ -1068,7 +1069,7 @@ void InitLinkBattleVsScreen(u8 taskId) break; case 1: palId = AllocSpritePalette(TAG_VS_LETTERS); - gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF; + gPlttBufferUnfaded[OBJ_PLTT_ID(palId) + 15] = gPlttBufferFaded[OBJ_PLTT_ID(palId) + 15] = RGB_WHITE; gBattleStruct->linkBattleVsSpriteId_V = CreateSprite(&sVsLetter_V_SpriteTemplate, 111, 80, 0); gBattleStruct->linkBattleVsSpriteId_S = CreateSprite(&sVsLetter_S_SpriteTemplate, 129, 80, 0); gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = TRUE; diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 15f74831c..6366404ce 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1183,7 +1183,7 @@ static void CB2_InitSelectScreen(void) #else if (sFactorySelectScreen->fromSummaryScreen == TRUE) #endif - gPlttBufferUnfaded[228] = sFactorySelectScreen->speciesNameColorBackup; + gPlttBufferUnfaded[BG_PLTT_ID(14) + 4] = sFactorySelectScreen->speciesNameColorBackup; LoadPalette(sMonPicBg_Pal, BG_PLTT_ID(2), PLTT_SIZEOF(2)); gMain.state++; break; @@ -1449,7 +1449,7 @@ static void Select_Task_OpenSummaryScreen(u8 taskId) switch (gTasks[taskId].tState) { case STATE_SUMMARY_FADE: - gPlttBufferUnfaded[228] = gPlttBufferFaded[228]; + gPlttBufferUnfaded[BG_PLTT_ID(14) + 4] = gPlttBufferFaded[BG_PLTT_ID(14) + 4]; BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gTasks[taskId].tState = STATE_SUMMARY_CLEAN; break; @@ -1468,7 +1468,7 @@ static void Select_Task_OpenSummaryScreen(u8 taskId) } break; case STATE_SUMMARY_SHOW: - sFactorySelectScreen->speciesNameColorBackup = gPlttBufferUnfaded[228]; + sFactorySelectScreen->speciesNameColorBackup = gPlttBufferUnfaded[BG_PLTT_ID(14) + 4]; DestroyTask(taskId); sFactorySelectScreen->fromSummaryScreen = TRUE; currMonId = sFactorySelectScreen->cursorPos; @@ -1641,8 +1641,8 @@ static void Select_Task_HandleMenu(u8 taskId) { if (sFactorySelectScreen->fromSummaryScreen == TRUE) { - gPlttBufferFaded[228] = sFactorySelectScreen->speciesNameColorBackup; - gPlttBufferUnfaded[228] = gPlttBufferUnfaded[244]; + gPlttBufferFaded[BG_PLTT_ID(14) + 4] = sFactorySelectScreen->speciesNameColorBackup; + gPlttBufferUnfaded[BG_PLTT_ID(14) + 4] = gPlttBufferUnfaded[BG_PLTT_ID(15) + 4]; } sFactorySelectScreen->fromSummaryScreen = FALSE; gTasks[taskId].tState = STATE_MENU_HANDLE_INPUT; @@ -2388,7 +2388,7 @@ static void Swap_Task_OpenSummaryScreen(u8 taskId) case STATE_SUMMARY_SHOW: DestroyTask(taskId); sFactorySwapScreen->fromSummaryScreen = TRUE; - sFactorySwapScreen->speciesNameColorBackup = gPlttBufferUnfaded[244]; + sFactorySwapScreen->speciesNameColorBackup = gPlttBufferUnfaded[BG_PLTT_ID(15) + 4]; ShowPokemonSummaryScreen(SUMMARY_MODE_NORMAL, gPlayerParty, sFactorySwapScreen->cursorPos, FRONTIER_PARTY_SIZE - 1, CB2_InitSwapScreen); break; } @@ -2761,7 +2761,7 @@ static void Swap_Task_FadeOutSpeciesName(u8 taskId) if (sFactorySwapScreen->fadeSpeciesNameCoeffDelay > 3) { sFactorySwapScreen->fadeSpeciesNameCoeffDelay = 0; - gPlttBufferUnfaded[244] = gPlttBufferFaded[228]; + gPlttBufferUnfaded[BG_PLTT_ID(15) + 4] = gPlttBufferFaded[BG_PLTT_ID(14) + 4]; sFactorySwapScreen->fadeSpeciesNameCoeff++; } BlendPalettes(0x4000, sFactorySwapScreen->fadeSpeciesNameCoeff, 0); @@ -3125,7 +3125,7 @@ static void Swap_Task_ScreenInfoTransitionIn(u8 taskId) if (gTasks[taskId].tSlideFinishedPkmn == TRUE && gTasks[taskId].tSlideFinishedCancel == TRUE) { - gPlttBufferFaded[226] = sPokeballGray_Pal[37]; + gPlttBufferFaded[BG_PLTT_ID(14) + 2] = sPokeballGray_Pal[37]; Swap_PrintActionStrings(); PutWindowTilemap(SWAP_WIN_ACTION_FADE); gTasks[taskId].tState++; @@ -3864,7 +3864,7 @@ static void Swap_PrintMonSpeciesAtFade(void) CpuCopy16(sSwapText_Pal, pal, 8); if (!sFactorySwapScreen->fromSummaryScreen) - pal[4] = gPlttBufferFaded[228]; + pal[4] = gPlttBufferFaded[BG_PLTT_ID(14) + 4]; else pal[4] = sFactorySwapScreen->speciesNameColorBackup; LoadPalette(pal, BG_PLTT_ID(15), sizeof(sSwapText_Pal)); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index b1187b59e..5f168d88b 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -618,7 +618,7 @@ static void BattleLoadMonSpriteGfx(struct Pokemon *mon, u32 battlerId, bool32 op if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE) { BlendPalette(paletteOffset, 16, 6, RGB_WHITE); - CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16)); + CpuCopy32(&gPlttBufferFaded[paletteOffset], &gPlttBufferUnfaded[paletteOffset], PLTT_SIZEOF(16)); } } @@ -942,7 +942,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 castform, bo if (gBattleSpritesDataPtr->battlerData[battlerAtk].transformSpecies != SPECIES_NONE) { BlendPalette(paletteOffset, 16, 6, RGB_WHITE); - CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16)); + CpuCopy32(&gPlttBufferFaded[paletteOffset], &gPlttBufferUnfaded[paletteOffset], PLTT_SIZEOF(16)); } gSprites[gBattlerSpriteIds[battlerAtk]].y = GetBattlerSpriteDefault_Y(battlerAtk); } @@ -966,7 +966,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 castform, bo if (!megaEvo) { BlendPalette(paletteOffset, 16, 6, RGB_WHITE); - CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16)); + CpuCopy32(&gPlttBufferFaded[paletteOffset], &gPlttBufferUnfaded[paletteOffset], PLTT_SIZEOF(16)); } if (!IsContest() && !megaEvo) diff --git a/src/battle_interface.c b/src/battle_interface.c index 58b1d1117..518bad2c9 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -2241,7 +2241,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) pltAdder += battlerId + 12; FillPalette(sStatusIconColors[statusPalId], OBJ_PLTT_OFFSET + pltAdder, PLTT_SIZEOF(1)); - CpuCopy16(gPlttBufferUnfaded + OBJ_PLTT_OFFSET + pltAdder, (u16 *)OBJ_PLTT + pltAdder, PLTT_SIZEOF(1)); + CpuCopy16(&gPlttBufferUnfaded[OBJ_PLTT_OFFSET + pltAdder], (u16 *)OBJ_PLTT + pltAdder, PLTT_SIZEOF(1)); CpuCopy32(statusGfxPtr, (void *)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * TILE_SIZE_4BPP), 96); if (WhichBattleCoords(battlerId) == 1 || GetBattlerSide(battlerId) == B_SIDE_OPPONENT) { diff --git a/src/battle_message.c b/src/battle_message.c index 3b67034e5..3edb02f60 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -3892,11 +3892,11 @@ void SetPpNumbersPaletteInMoveSelection(void) else var = GetCurrentPpToMaxPpState(chooseMoveStruct->currentPp[gMoveSelectionCursor[gActiveBattler]], gBattleMoves[gMoveSelectionCursor[gActiveBattler]].pp); - gPlttBufferUnfaded[92] = palPtr[(var * 2) + 0]; - gPlttBufferUnfaded[91] = palPtr[(var * 2) + 1]; + gPlttBufferUnfaded[BG_PLTT_ID(5) + 12] = palPtr[(var * 2) + 0]; + gPlttBufferUnfaded[BG_PLTT_ID(5) + 11] = palPtr[(var * 2) + 1]; - CpuCopy16(&gPlttBufferUnfaded[92], &gPlttBufferFaded[92], sizeof(u16)); - CpuCopy16(&gPlttBufferUnfaded[91], &gPlttBufferFaded[91], sizeof(u16)); + CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(5) + 12], &gPlttBufferFaded[BG_PLTT_ID(5) + 12], PLTT_SIZEOF(1)); + CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(5) + 11], &gPlttBufferFaded[BG_PLTT_ID(5) + 11], PLTT_SIZEOF(1)); } u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index ffed24980..211488ee5 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1185,7 +1185,7 @@ static void Task_SetPyramidFloorPalette(u8 taskId) { if (gPaletteFade.active) { - CpuCopy16(gBattlePyramidFloor_Pal[gSaveBlock2Ptr->frontier.curChallengeBattleNum], &gPlttBufferUnfaded[96], 32); + CpuCopy16(gBattlePyramidFloor_Pal[gSaveBlock2Ptr->frontier.curChallengeBattleNum], &gPlttBufferUnfaded[BG_PLTT_ID(6)], PLTT_SIZE_4BPP); DestroyTask(taskId); } } diff --git a/src/battle_records.c b/src/battle_records.c index 4463a9ebf..edc48d820 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -444,7 +444,7 @@ static void LoadTrainerHillRecordsWindowGfx(u8 bgId) { LoadBgTiles(bgId, sTrainerHillWindowTileset, sizeof(sTrainerHillWindowTileset), 0); CopyToBgTilemapBufferRect(bgId, sTrainerHillWindowTilemap, 0, 0, 0x20, 0x20); - LoadPalette(sTrainerHillWindowPalette, BG_PLTT_ID(0), PLTT_SIZE_4BPP); + LoadPalette(sTrainerHillWindowPalette, BG_PLTT_ID(0), sizeof(sTrainerHillWindowPalette)); } static void VblankCB_TrainerHillRecords(void) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index d7ac1ef80..7f4b4b121 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8118,7 +8118,7 @@ static void InitLevelUpBanner(void) gBattle_BG2_Y = 0; gBattle_BG2_X = LEVEL_UP_BANNER_START; - LoadPalette(sLevelUpBanner_Pal, BG_PLTT_ID(6), PLTT_SIZE_4BPP); + LoadPalette(sLevelUpBanner_Pal, BG_PLTT_ID(6), sizeof(sLevelUpBanner_Pal)); CopyToWindowPixelBuffer(B_WIN_LEVEL_UP_BANNER, sLevelUpBanner_Gfx, 0, 0); PutWindowTilemap(B_WIN_LEVEL_UP_BANNER); CopyWindowToVram(B_WIN_LEVEL_UP_BANNER, COPYWIN_FULL); diff --git a/src/battle_transition.c b/src/battle_transition.c index 4066f72e5..2e87b9c1d 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1069,7 +1069,7 @@ static void Task_BattleTransition(u8 taskId) static bool8 Transition_StartIntro(struct Task *task) { SetWeatherScreenFadeOut(); - CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, sizeof(gPlttBufferUnfaded)); + CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_SIZE); if (sTasks_Intro[task->tTransitionId] != NULL) { CreateTask(sTasks_Intro[task->tTransitionId], 4); @@ -4498,7 +4498,7 @@ static bool8 FrontierSquares_Shrink(struct Task *task) switch (task->tShrinkState) { case 0: - for (i = 250; i < 255; i++) + for (i = BG_PLTT_ID(15) + 10; i < BG_PLTT_ID(15) + 15; i++) { gPlttBufferUnfaded[i] = RGB_BLACK; gPlttBufferFaded[i] = RGB_BLACK; diff --git a/src/battle_transition_frontier.c b/src/battle_transition_frontier.c index 252721129..417bd96d6 100644 --- a/src/battle_transition_frontier.c +++ b/src/battle_transition_frontier.c @@ -46,7 +46,7 @@ static bool8 CirclesSymmetricSpiralInSeq_End(struct Task *task); #define PALTAG_LOGO_CIRCLES 0x2E90 static const u32 sLogoCenter_Gfx[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.4bpp.lz"); -static const u32 sLogoCenter_Tilemap[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.bin"); +static const u32 sLogoCenter_Tilemap[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.bin.lz"); static const u32 sLogoCircles_Gfx[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_circles.4bpp.lz"); static const u16 sLogo_Pal[] = INCBIN_U16("graphics/battle_transitions/frontier_logo_circles.gbapal"); diff --git a/src/berry_blender.c b/src/berry_blender.c index e4ed5d0bf..60c38370f 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1033,11 +1033,12 @@ static void InitBerryBlenderWindows(void) s32 i; DeactivateAllTextPrinters(); - for (i = 0; i < 5; i++) + // Initialize only the main text windows (player names and message box; excludes results screen) + for (i = 0; i < WIN_RESULTS; i++) FillWindowPixelBuffer(i, PIXEL_FILL(0)); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT); - Menu_LoadStdPalAt(0xE0); + Menu_LoadStdPalAt(BG_PLTT_ID(14)); } } diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 5c8af3378..216aff696 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -367,7 +367,7 @@ static void HandleInitWindows(void) InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadPalette(sFontPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); + LoadPalette(sFontPalette, BG_PLTT_ID(15), sizeof(sFontPalette)); for (i = 0; i < ARRAY_COUNT(sWindowTemplates) - 1; i++) PutWindowTilemap(i); ScheduleBgCopyTilemapToVram(0); diff --git a/src/contest.c b/src/contest.c index eadf960a2..55207eb3e 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1076,10 +1076,10 @@ static void LoadContestPalettes(void) { s32 i; - LoadPalette(sText_Pal, BG_PLTT_ID(15), PLTT_SIZE_4BPP); + LoadPalette(sText_Pal, BG_PLTT_ID(15), sizeof(sText_Pal)); SetBackdropFromColor(RGB_BLACK); for (i = 10; i < 14; i++) - LoadPalette(gPlttBufferUnfaded + BG_PLTT_ID(15) + 1, BG_PLTT_ID(15) + i, PLTT_SIZEOF(1)); + LoadPalette(&gPlttBufferUnfaded[BG_PLTT_ID(15) + 1], BG_PLTT_ID(15) + i, PLTT_SIZEOF(1)); FillPalette(RGB(31, 17, 31), BG_PLTT_ID(15) + 3, PLTT_SIZEOF(1)); } @@ -1331,10 +1331,10 @@ static bool8 SetupContestGraphics(u8 *stateVar) break; case 5: LoadCompressedPalette(gContestInterfaceAudiencePalette, BG_PLTT_OFFSET, BG_PLTT_SIZE); - CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(8), tempPalette1, PLTT_SIZE_4BPP); - CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(5 + gContestPlayerMonIndex), tempPalette2, PLTT_SIZE_4BPP); - CpuCopy32(tempPalette2, gPlttBufferUnfaded + BG_PLTT_ID(8), PLTT_SIZE_4BPP); - CpuCopy32(tempPalette1, gPlttBufferUnfaded + BG_PLTT_ID(5 + gContestPlayerMonIndex), PLTT_SIZE_4BPP); + CpuCopy32(&gPlttBufferUnfaded[BG_PLTT_ID(8)], tempPalette1, PLTT_SIZE_4BPP); + CpuCopy32(&gPlttBufferUnfaded[BG_PLTT_ID(5 + gContestPlayerMonIndex)], tempPalette2, PLTT_SIZE_4BPP); + CpuCopy32(tempPalette2, &gPlttBufferUnfaded[BG_PLTT_ID(8)], PLTT_SIZE_4BPP); + CpuCopy32(tempPalette1, &gPlttBufferUnfaded[BG_PLTT_ID(5 + gContestPlayerMonIndex)], PLTT_SIZE_4BPP); DmaCopy32Defvars(3, gPlttBufferUnfaded, eContestTempSave.cachedWindowPalettes, sizeof(eContestTempSave.cachedWindowPalettes)); LoadContestPalettes(); break; @@ -1475,7 +1475,7 @@ static void Task_DisplayAppealNumberText(u8 taskId) gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; ContestDebugDoPrint(); - DmaCopy32Defvars(3, gPlttBufferUnfaded, eContestTempSave.cachedPlttBufferUnfaded, PLTT_BUFFER_SIZE * 2); + DmaCopy32Defvars(3, gPlttBufferUnfaded, eContestTempSave.cachedPlttBufferUnfaded, PLTT_SIZE); ConvertIntToDecimalStringN(gStringVar1, eContest.appealNumber + 1, STR_CONV_MODE_LEFT_ALIGN, 1); if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex)) StringCopy(gDisplayedStringBattle, gText_AppealNumWhichMoveWillBePlayed); @@ -1674,8 +1674,8 @@ static void Task_HideMoveSelectScreen(u8 taskId) } Contest_SetBgCopyFlags(0); // This seems to be a bug; it should have just copied PLTT_BUFFER_SIZE. - DmaCopy32Defvars(3, gPlttBufferFaded, eContestTempSave.cachedPlttBufferFaded, PLTT_BUFFER_SIZE * 2); - LoadPalette(eContestTempSave.cachedPlttBufferUnfaded, 0, PLTT_BUFFER_SIZE * 2); + DmaCopy32Defvars(3, gPlttBufferFaded, eContestTempSave.cachedPlttBufferFaded, PLTT_SIZE); + LoadPalette(eContestTempSave.cachedPlttBufferUnfaded, 0, PLTT_SIZE); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; gTasks[taskId].func = Task_HideApplauseMeterForAppealStart; @@ -2561,7 +2561,7 @@ static void Task_WaitForHeartSliders(u8 taskId) static void Task_RestorePlttBufferUnfaded(u8 taskId) { - DmaCopy32Defvars(3, eContestTempSave.cachedPlttBufferUnfaded, gPlttBufferUnfaded, PLTT_BUFFER_SIZE * 2); + DmaCopy32Defvars(3, eContestTempSave.cachedPlttBufferUnfaded, gPlttBufferUnfaded, PLTT_SIZE); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 2; gTasks[taskId].func = Task_WaitPrintRoundResult; @@ -4065,14 +4065,14 @@ static void UpdateBlendTaskContestantData(u8 contestant) palOffset1 = contestant + 5; DmaCopy16Defvars(3, - gPlttBufferUnfaded + palOffset1 * 16 + 10, - gPlttBufferFaded + palOffset1 * 16 + 10, - 2); - palOffset2 = (contestant + 5) * 16 + 12 + contestant; + &gPlttBufferUnfaded[PLTT_ID(palOffset1) + 10], + &gPlttBufferFaded[PLTT_ID(palOffset1) + 10], + PLTT_SIZEOF(1)); + palOffset2 = PLTT_ID(contestant + 5) + 12 + contestant; DmaCopy16Defvars(3, - gPlttBufferUnfaded + palOffset2, - gPlttBufferFaded + palOffset2, - 2); + &gPlttBufferUnfaded[palOffset2], + &gPlttBufferFaded[palOffset2], + PLTT_SIZEOF(1)); } // See comments on CreateUnusedBlendTask diff --git a/src/contest_util.c b/src/contest_util.c index 53a81dea0..5da02a285 100644 --- a/src/contest_util.c +++ b/src/contest_util.c @@ -456,7 +456,7 @@ static void LoadContestResultsBgGfx(void) CopyToBgTilemapBuffer(2, gContestResults_Interface_Tilemap, 0, 0); CopyToBgTilemapBuffer(0, gContestResults_WinnerBanner_Tilemap, 0, 0); LoadContestResultsTitleBarTilemaps(); - LoadCompressedPalette(gContestResults_Pal, BG_PLTT_ID(0), 16 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gContestResults_Pal, BG_PLTT_OFFSET, BG_PLTT_SIZE); LoadPalette(sResultsTextWindow_Pal, BG_PLTT_ID(15), sizeof(sResultsTextWindow_Pal)); for (i = 0; i < CONTESTANT_COUNT; i++) diff --git a/src/decoration.c b/src/decoration.c index 6d95cfbdc..27ef85de9 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -688,7 +688,7 @@ static void ReturnToDecorationActionsAfterInvalidSelection(u8 taskId) static void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId) { - LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(13), PLTT_SIZE_4BPP); + LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(13), sizeof(sDecorationMenuPalette)); ClearDialogWindowAndFrame(0, FALSE); RemoveDecorationWindow(WINDOW_MAIN_MENU); InitDecorationCategoriesWindow(taskId); @@ -834,7 +834,7 @@ static void ReturnToActionsMenuFromCategories(u8 taskId) void ShowDecorationCategoriesWindow(u8 taskId) { - LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(13), PLTT_SIZE_4BPP); + LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(13), sizeof(sDecorationMenuPalette)); ClearDialogWindowAndFrame(0, FALSE); gTasks[taskId].tDecorationMenuCommand = DECOR_MENU_TRADE; sCurDecorationCategory = DECORCAT_DESK; diff --git a/src/diploma.c b/src/diploma.c index 4f6264492..2a1886745 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -72,7 +72,7 @@ void CB2_ShowDiploma(void) ResetSpriteData(); ResetPaletteFade(); FreeAllSpritePalettes(); - LoadPalette(sDiplomaPalettes, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); + LoadPalette(sDiplomaPalettes, BG_PLTT_ID(0), sizeof(sDiplomaPalettes)); sDiplomaTilemapPtr = Alloc(0x1000); InitDiplomaBg(); InitDiplomaWindow(); diff --git a/src/easy_chat.c b/src/easy_chat.c index 12a3a0808..8621a0163 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -3930,12 +3930,12 @@ static void LoadEasyChatPalettes(void) { ResetPaletteFade(); LoadPalette(gEasyChatMode_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); - LoadPalette(sTextInputFrameOrange_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); - LoadPalette(sTextInputFrameGreen_Pal, BG_PLTT_ID(4), PLTT_SIZE_4BPP); - LoadPalette(sTitleText_Pal, BG_PLTT_ID(10), PLTT_SIZEOF(4)); - LoadPalette(sText_Pal, BG_PLTT_ID(11), PLTT_SIZEOF(6)); - LoadPalette(sText_Pal, BG_PLTT_ID(15), PLTT_SIZEOF(6)); - LoadPalette(sText_Pal, BG_PLTT_ID(3), PLTT_SIZEOF(6)); + LoadPalette(sTextInputFrameOrange_Pal, BG_PLTT_ID(1), sizeof(sTextInputFrameOrange_Pal)); + LoadPalette(sTextInputFrameGreen_Pal, BG_PLTT_ID(4), sizeof(sTextInputFrameGreen_Pal)); + LoadPalette(sTitleText_Pal, BG_PLTT_ID(10), sizeof(sTitleText_Pal)); + LoadPalette(sText_Pal, BG_PLTT_ID(11), sizeof(sText_Pal)); + LoadPalette(sText_Pal, BG_PLTT_ID(15), sizeof(sText_Pal)); + LoadPalette(sText_Pal, BG_PLTT_ID(3), sizeof(sText_Pal)); } static void PrintTitle(void) diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index a86f16201..96ff1b52d 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -409,7 +409,7 @@ static void Task_Sparkles_SprayAndFlash_Init(u8 taskId) { SetEvoSparklesMatrices(); gTasks[taskId].tTimer = 0; - CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); + CpuCopy16(&gPlttBufferFaded[BG_PLTT_ID(2)], &gPlttBufferUnfaded[BG_PLTT_ID(2)], 3 * PLTT_SIZE_4BPP); BeginNormalPaletteFade(0xFFF9041C, 0, 0, 0x10, RGB_WHITE); // was 0xFFF9001C in R/S gTasks[taskId].func = Task_Sparkles_SprayAndFlash; PlaySE(SE_M_PETAL_DANCE); @@ -458,7 +458,7 @@ static void Task_Sparkles_SprayAndFlashTrade_Init(u8 taskId) { SetEvoSparklesMatrices(); gTasks[taskId].tTimer = 0; - CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); + CpuCopy16(&gPlttBufferFaded[BG_PLTT_ID(2)], &gPlttBufferUnfaded[BG_PLTT_ID(2)], 3 * PLTT_SIZE_4BPP); BeginNormalPaletteFade(0xFFF90400, 0, 0, 0x10, RGB_WHITE); // was 0xFFFF0001 in R/S gTasks[taskId].func = Task_Sparkles_SprayAndFlashTrade; PlaySE(SE_M_PETAL_DANCE); @@ -536,13 +536,13 @@ u8 CycleEvolutionMonSprite(u8 preEvoSpriteId, u8 postEvoSpriteId) gSprites[preEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[preEvoSpriteId].oam.matrixNum = MATRIX_PRE_EVO; gSprites[preEvoSpriteId].invisible = FALSE; - CpuSet(monPalette, &gPlttBufferFaded[0x100 + (gSprites[preEvoSpriteId].oam.paletteNum * 16)], 16); + CpuSet(monPalette, &gPlttBufferFaded[OBJ_PLTT_ID(gSprites[preEvoSpriteId].oam.paletteNum)], 16); gSprites[postEvoSpriteId].callback = SpriteCB_EvolutionMonSprite; gSprites[postEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[postEvoSpriteId].oam.matrixNum = MATRIX_POST_EVO; gSprites[postEvoSpriteId].invisible = FALSE; - CpuSet(monPalette, &gPlttBufferFaded[0x100 + (gSprites[postEvoSpriteId].oam.paletteNum * 16)], 16); + CpuSet(monPalette, &gPlttBufferFaded[OBJ_PLTT_ID(gSprites[postEvoSpriteId].oam.paletteNum)], 16); gTasks[taskId].tEvoStopped = FALSE; return taskId; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index a3639d4c7..ec331bf01 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -299,7 +299,7 @@ void EvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u gTasks[id].tEvoWasStopped = FALSE; gTasks[id].tPartyId = partyId; - memcpy(&sEvoStructPtr->savedPalette, &gPlttBufferUnfaded[0x20], sizeof(sEvoStructPtr->savedPalette)); + memcpy(&sEvoStructPtr->savedPalette, &gPlttBufferUnfaded[BG_PLTT_ID(2)], sizeof(sEvoStructPtr->savedPalette)); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP); @@ -752,7 +752,7 @@ static void Task_EvolutionScene(u8 taskId) if (IsSEPlaying()) { m4aMPlayAllStop(); - memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, sizeof(sEvoStructPtr->savedPalette)); + memcpy(&gPlttBufferUnfaded[BG_PLTT_ID(2)], sEvoStructPtr->savedPalette, sizeof(sEvoStructPtr->savedPalette)); RestoreBgAfterAnim(); BeginNormalPaletteFade(0x1C, 0, 0x10, 0, RGB_BLACK); gTasks[taskId].tState++; @@ -1181,7 +1181,7 @@ static void Task_TradeEvolutionScene(u8 taskId) // Restore bg, do mon anim/cry Free(sBgAnimPal); EvoScene_DoMonAnimAndCry(sEvoStructPtr->postEvoSpriteId, gTasks[taskId].tPostEvoSpecies); - memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, sizeof(sEvoStructPtr->savedPalette)); + memcpy(&gPlttBufferUnfaded[BG_PLTT_ID(2)], sEvoStructPtr->savedPalette, sizeof(sEvoStructPtr->savedPalette)); gTasks[taskId].tState++; } break; diff --git a/src/field_effect.c b/src/field_effect.c index b5880b3fc..b8e3cecc6 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -900,7 +900,8 @@ u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buf return CreateSprite(&spriteTemplate, x, y, subpriority); } -void LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest) +// Unused +static void LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest) { LZDecompressVram(gTrainerFrontPicTable[gender].data, dest); LoadCompressedPalette(gTrainerFrontPicPaletteTable[gender].data, palOffset, PLTT_SIZE_4BPP); @@ -1190,14 +1191,14 @@ static void PokeballGlowEffect_Flash1(struct Sprite *sprite) sprite->data[3]++; } phase = (sprite->sCounter + 3) & 3; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x108, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 8, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); phase = (sprite->sCounter + 2) & 3; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x106, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 6, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); phase = (sprite->sCounter + 1) & 3; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x102, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 2, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); phase = sprite->sCounter; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x105, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x103, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 5, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 3, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); if (sprite->data[3] > 2) { sprite->sState++; @@ -1221,19 +1222,17 @@ static void PokeballGlowEffect_Flash2(struct Sprite *sprite) } } phase = sprite->sCounter; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x108, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x106, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x102, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x105, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x103, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 8, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 6, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 2, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 5, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW)) + 3, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); } static void PokeballGlowEffect_WaitAfterFlash(struct Sprite *sprite) { if ((--sprite->sTimer) == 0) - { sprite->sState++; - } } static void PokeballGlowEffect_Dummy(struct Sprite *sprite) diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 7c98703c6..a2b3d6366 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -264,7 +264,7 @@ void ExecuteTruckSequence(void) MapGridSetMetatileIdAt(4 + MAP_OFFSET, 3 + MAP_OFFSET, METATILE_InsideOfTruck_DoorClosedFloor_Bottom); DrawWholeMapView(); LockPlayerFieldControls(); - CpuFastFill(0, gPlttBufferFaded, 0x400); + CpuFastFill(0, gPlttBufferFaded, PLTT_SIZE); CreateTask(Task_HandleTruckSequence, 0xA); } diff --git a/src/field_weather.c b/src/field_weather.c index 92863dee5..73aef3746 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -156,7 +156,7 @@ void StartWeather(void) if (!FuncIsActiveTask(Task_WeatherMain)) { u8 index = AllocSpritePalette(PALTAG_WEATHER); - CpuCopy32(gFogPalette, &gPlttBufferUnfaded[0x100 + index * 16], 32); + CpuCopy32(gFogPalette, &gPlttBufferUnfaded[OBJ_PLTT_ID(index)], PLTT_SIZE_4BPP); BuildColorMaps(); gWeatherPtr->contrastColorMapSpritePalIndex = index; gWeatherPtr->weatherPicSpritePalIndex = AllocSpritePalette(PALTAG_WEATHER_2); @@ -471,7 +471,7 @@ static void ApplyColorMap(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex) if (colorMapIndex > 0) { colorMapIndex--; - palOffset = startPalIndex * 16; + palOffset = PLTT_ID(startPalIndex); numPalettes += startPalIndex; curPalIndex = startPalIndex; @@ -481,7 +481,7 @@ static void ApplyColorMap(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex) if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_NONE) { // No palette change. - CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16)); + CpuFastCopy(&gPlttBufferUnfaded[palOffset], &gPlttBufferFaded[palOffset], PLTT_SIZE_4BPP); palOffset += 16; } else @@ -511,7 +511,7 @@ static void ApplyColorMap(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex) { // A negative gammIndex value means that the blending will come from the special Drought weather's palette tables. colorMapIndex = -colorMapIndex - 1; - palOffset = startPalIndex * 16; + palOffset = PLTT_ID(startPalIndex); numPalettes += startPalIndex; curPalIndex = startPalIndex; @@ -520,7 +520,7 @@ static void ApplyColorMap(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex) if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_NONE) { // No palette change. - CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16)); + CpuFastCopy(&gPlttBufferUnfaded[palOffset], &gPlttBufferFaded[palOffset], PLTT_SIZE_4BPP); palOffset += 16; } else @@ -538,7 +538,7 @@ static void ApplyColorMap(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex) else { // No palette blending. - CpuFastCopy(gPlttBufferUnfaded + startPalIndex * 16, gPlttBufferFaded + startPalIndex * 16, numPalettes * 16 * sizeof(u16)); + CpuFastCopy(&gPlttBufferUnfaded[PLTT_ID(startPalIndex)], &gPlttBufferFaded[PLTT_ID(startPalIndex)], numPalettes * PLTT_SIZE_4BPP); } } @@ -552,7 +552,7 @@ static void ApplyColorMapWithBlend(u8 startPalIndex, u8 numPalettes, s8 colorMap u8 gBlend = color.g; u8 bBlend = color.b; - palOffset = BG_PLTT_ID(startPalIndex); + palOffset = PLTT_ID(startPalIndex); numPalettes += startPalIndex; colorMapIndex--; curPalIndex = startPalIndex; @@ -666,8 +666,8 @@ static void ApplyFogBlend(u8 blendCoeff, u16 blendColor) { if (LightenSpritePaletteInFog(curPalIndex)) { - u16 palEnd = (curPalIndex + 1) * 16; - u16 palOffset = curPalIndex * 16; + u16 palEnd = PLTT_ID(curPalIndex + 1); + u16 palOffset = PLTT_ID(curPalIndex); while (palOffset < palEnd) { @@ -786,7 +786,7 @@ void FadeScreen(u8 mode, s8 delay) if (fadeOut) { if (useWeatherPal) - CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_BUFFER_SIZE * 2); + CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_SIZE); BeginNormalPaletteFade(PALETTES_ALL, delay, 0, 16, fadeColor); gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; @@ -824,14 +824,14 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) { if (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL) MarkFogSpritePalToLighten(paletteIndex); - paletteIndex *= 16; + paletteIndex = PLTT_ID(paletteIndex); for (i = 0; i < 16; i++) gPlttBufferFaded[paletteIndex + i] = gWeatherPtr->fadeDestColor; } break; case WEATHER_PAL_STATE_SCREEN_FADING_OUT: paletteIndex = PLTT_ID(paletteIndex); - CpuFastCopy(gPlttBufferFaded + paletteIndex, gPlttBufferUnfaded + paletteIndex, PLTT_SIZE_4BPP); + CpuFastCopy(&gPlttBufferFaded[paletteIndex], &gPlttBufferUnfaded[paletteIndex], PLTT_SIZE_4BPP); BlendPalette(paletteIndex, 16, gPaletteFade.y, gPaletteFade.blendColor); break; // WEATHER_PAL_STATE_CHANGING_WEATHER diff --git a/src/fieldmap.c b/src/fieldmap.c index df4db47b5..bdacf7ab2 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -871,7 +871,7 @@ static void ApplyGlobalTintToPaletteSlot(u8 slot, u8 count) } -void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u16 size) +static void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u16 size) { u16 black = RGB_BLACK; diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 87d011741..5c7d23b5a 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -270,7 +270,7 @@ static void Task_ExitCaveTransition4(u8 taskId) if (count < 8) { gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(14), PLTT_SIZEOF(8) - PLTT_SIZEOF(count)); + LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_Exit) - PLTT_SIZEOF(count)); } else { diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 5ed133e5d..a28b6fee6 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -52,8 +52,8 @@ void StartSweetScentFieldEffect(void) u32 palettes = ~(1 << (gSprites[GetPlayerAvatarSpriteId()].oam.paletteNum + 16) | (1 << 13) | (1 << 14) | (1 << 15)); PlaySE(SE_M_SWEET_SCENT); - CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100); - CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100); + CpuFastCopy(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_SIZE); + CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_SIZE); BeginNormalPaletteFade(palettes, 4, 0, 8, RGB_RED); taskId = CreateTask(TrySweetScentEncounter, 0); gTasks[taskId].data[0] = 0; @@ -91,7 +91,7 @@ static void FailSweetScentEncounter(u8 taskId) { if (!gPaletteFade.active) { - CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100); + CpuFastCopy(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_SIZE); SetWeatherPalStateIdle(); ScriptContext_SetupScript(EventScript_FailSweetScent); DestroyTask(taskId); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 402db27a1..18b4c3e4b 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -740,7 +740,7 @@ static void Task_Hof_ExitOnKeyPressed(u8 taskId) static void Task_Hof_HandlePaletteOnExit(u8 taskId) { - CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); + CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_SIZE); BeginNormalPaletteFade(PALETTES_ALL, 8, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_Hof_HandleExit; } @@ -1044,7 +1044,7 @@ static void Task_HofPC_HandlePaletteOnExit(u8 taskId) { struct HallofFameTeam *fameTeam; - CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); + CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_SIZE); fameTeam = (struct HallofFameTeam *)(gDecompressionBuffer); fameTeam->mon[0] = sDummyFameMon; ComputerScreenCloseEffect(0, 0, 0); @@ -1269,7 +1269,7 @@ static void ClearVramOamPltt_LoadHofPal(void) DmaFill16(3, 0, plttOffset, plttSize); ResetPaletteFade(); - LoadPalette(sHallOfFame_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); + LoadPalette(sHallOfFame_Pal, BG_PLTT_ID(0), sizeof(sHallOfFame_Pal)); } static void LoadHofGfx(void) diff --git a/src/intro.c b/src/intro.c index 38b2f0027..bfc23a74b 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1193,13 +1193,13 @@ void Task_Scene1_Load(u8 taskId) LoadSpritePalettes(sSpritePalettes_Intro1); LoadCompressedSpriteSheet(sSpriteSheet_Sparkle); LoadSpritePalettes(sSpritePalette_Sparkle); - CpuCopy16(&gPlttBufferUnfaded[0x100], &gPlttBufferUnfaded[0x1F0], 0x20); - CpuCopy16(&gPlttBufferUnfaded[0x100], &gPlttBufferUnfaded[0x1E1], 0x1E); - CpuCopy16(&gPlttBufferUnfaded[0x100], &gPlttBufferUnfaded[0x1D2], 0x1C); - CpuCopy16(&gPlttBufferUnfaded[0x100], &gPlttBufferUnfaded[0x1C3], 0x1A); - CpuCopy16(&gPlttBufferUnfaded[0x100], &gPlttBufferUnfaded[0x1B4], 0x18); - CpuCopy16(&gPlttBufferUnfaded[0x100], &gPlttBufferUnfaded[0x1A5], 0x16); - CpuCopy16(&gPlttBufferUnfaded[0x100], &gPlttBufferUnfaded[0x196], 0x14); + CpuCopy16(&gPlttBufferUnfaded[OBJ_PLTT_ID(0)], &gPlttBufferUnfaded[OBJ_PLTT_ID(15) + 0], PLTT_SIZEOF(16 - 0)); + CpuCopy16(&gPlttBufferUnfaded[OBJ_PLTT_ID(0)], &gPlttBufferUnfaded[OBJ_PLTT_ID(14) + 1], PLTT_SIZEOF(16 - 1) + 1); // Copying an extra half color? + CpuCopy16(&gPlttBufferUnfaded[OBJ_PLTT_ID(0)], &gPlttBufferUnfaded[OBJ_PLTT_ID(13) + 2], PLTT_SIZEOF(16 - 2)); + CpuCopy16(&gPlttBufferUnfaded[OBJ_PLTT_ID(0)], &gPlttBufferUnfaded[OBJ_PLTT_ID(12) + 3], PLTT_SIZEOF(16 - 3)); + CpuCopy16(&gPlttBufferUnfaded[OBJ_PLTT_ID(0)], &gPlttBufferUnfaded[OBJ_PLTT_ID(11) + 4], PLTT_SIZEOF(16 - 4)); + CpuCopy16(&gPlttBufferUnfaded[OBJ_PLTT_ID(0)], &gPlttBufferUnfaded[OBJ_PLTT_ID(10) + 5], PLTT_SIZEOF(16 - 5)); + CpuCopy16(&gPlttBufferUnfaded[OBJ_PLTT_ID(0)], &gPlttBufferUnfaded[OBJ_PLTT_ID( 9) + 6], PLTT_SIZEOF(16 - 6)); CreateGameFreakLogoSprites(120, 80, 0); gTasks[taskId].sBigDropSpriteId = CreateWaterDrop(236, -14, 0x200, 1, 0x78, FALSE); gTasks[taskId].func = Task_Scene1_FadeIn; @@ -1889,7 +1889,7 @@ static void Task_Scene3_Groudon(u8 taskId) if (--tDelay == 0) { tDelay = 2; - CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[31], sizeof(u16)); + CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[BG_PLTT_ID(1) + 15], PLTT_SIZEOF(1)); tPalIdx += 2; if (tPalIdx == 0x1EC) tState++; @@ -1906,7 +1906,7 @@ static void Task_Scene3_Groudon(u8 taskId) if (--tDelay == 0) { tDelay = 2; - CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[31], sizeof(u16)); + CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[BG_PLTT_ID(1) + 15], PLTT_SIZEOF(1)); tPalIdx -= 2; if (tPalIdx == 0x1E0) { @@ -2148,7 +2148,7 @@ static void Task_Scene3_Kyogre(u8 taskId) if (--tDelay == 0) { tDelay = 4; - CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[47], sizeof(u16)); + CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[BG_PLTT_ID(2) + 15], PLTT_SIZEOF(1)); tPalIdx -= 2; if (tPalIdx == 0x1E0) tState++; @@ -2166,7 +2166,7 @@ static void Task_Scene3_Kyogre(u8 taskId) if (--tDelay == 0) { tDelay = 4; - CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[47], sizeof(u16)); + CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[BG_PLTT_ID(2) + 15], PLTT_SIZEOF(1)); tPalIdx += 2; if (tPalIdx == 0x1EE) { @@ -2497,7 +2497,7 @@ static void SpriteCB_Lightning(struct Sprite *sprite) sprite->sPalIdx = 0x1C2; sprite->sState++; case 1: - CpuCopy16(&gIntro3Bg_Pal[sprite->sPalIdx], &gPlttBufferFaded[93], 2); + CpuCopy16(&gIntro3Bg_Pal[sprite->sPalIdx], &gPlttBufferFaded[BG_PLTT_ID(5) + 13], PLTT_SIZEOF(1)); sprite->sPalIdx += 2; if (sprite->sPalIdx != 0x1CE) break; @@ -2508,7 +2508,7 @@ static void SpriteCB_Lightning(struct Sprite *sprite) if (--sprite->sDelay == 0) { sprite->sDelay = 4; - CpuCopy16(&gIntro3Bg_Pal[sprite->sPalIdx], &gPlttBufferFaded[93], 2); + CpuCopy16(&gIntro3Bg_Pal[sprite->sPalIdx], &gPlttBufferFaded[BG_PLTT_ID(5) + 13], PLTT_SIZEOF(1)); sprite->sPalIdx -= 2; if (sprite->sPalIdx == 0x1C0) DestroySprite(sprite); @@ -2611,7 +2611,7 @@ static void Task_RayquazaAttack(u8 taskId) case 0: if ((data[2] & 1) != 0) { - CpuCopy16(&gIntro3Bg_Pal[0x1A2 + data[1] * 2], &gPlttBufferFaded[94], 2); + CpuCopy16(&gIntro3Bg_Pal[0x1A2 + data[1] * 2], &gPlttBufferFaded[BG_PLTT_ID(5) + 14], PLTT_SIZEOF(1)); data[1]++; } if (data[1] == 6) @@ -2626,7 +2626,7 @@ static void Task_RayquazaAttack(u8 taskId) { if ((data[2] & 1) != 0) { - CpuCopy16(&gIntro3Bg_Pal[0x1A2 + data[1] * 2], &gPlttBufferFaded[88], 2); + CpuCopy16(&gIntro3Bg_Pal[0x1A2 + data[1] * 2], &gPlttBufferFaded[BG_PLTT_ID(5) + 8], PLTT_SIZEOF(1)); data[1]++; } if (data[1] == 6) @@ -2645,7 +2645,7 @@ static void Task_RayquazaAttack(u8 taskId) { if ((data[2] & 1) != 0) { - CpuCopy16(&gIntro3Bg_Pal[0x182 + data[1] * 2], &gPlttBufferFaded[92], 2); + CpuCopy16(&gIntro3Bg_Pal[0x182 + data[1] * 2], &gPlttBufferFaded[BG_PLTT_ID(5) + 12], PLTT_SIZEOF(1)); data[1]++; } if (data[1] == 6) @@ -3202,16 +3202,16 @@ static void SpriteCB_LogoLetter(struct Sprite *sprite) sprite->sColorDelay = 2; if (sprite->sTimer != 0) { - CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer], &gPlttBufferFaded[0x11F], 2); - CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 16], &gPlttBufferFaded[0x114], 2); - CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 32], &gPlttBufferFaded[0x11A], 2); + CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer], &gPlttBufferFaded[OBJ_PLTT_ID(1) + 15], PLTT_SIZEOF(1)); + CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 16], &gPlttBufferFaded[OBJ_PLTT_ID(1) + 4], PLTT_SIZEOF(1)); + CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 32], &gPlttBufferFaded[OBJ_PLTT_ID(1) + 10], PLTT_SIZEOF(1)); sprite->sTimer--; } else { - CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer], &gPlttBufferFaded[0x11F], 2); - CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 16], &gPlttBufferFaded[0x114], 2); - CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 32], &gPlttBufferFaded[0x11A], 2); + CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer], &gPlttBufferFaded[OBJ_PLTT_ID(1) + 15], PLTT_SIZEOF(1)); + CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 16], &gPlttBufferFaded[OBJ_PLTT_ID(1) + 4], PLTT_SIZEOF(1)); + CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 32], &gPlttBufferFaded[OBJ_PLTT_ID(1) + 10], PLTT_SIZEOF(1)); sprite->sState++; } } @@ -3231,9 +3231,9 @@ static void SpriteCB_LogoLetter(struct Sprite *sprite) sprite->sColorDelay = 2; if (sprite->sTimer <= COLOR_CHANGES) { - CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer], &gPlttBufferFaded[0x11F], 2); - CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 16], &gPlttBufferFaded[0x114], 2); - CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 32], &gPlttBufferFaded[0x11A], 2); + CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer], &gPlttBufferFaded[OBJ_PLTT_ID(1) + 15], PLTT_SIZEOF(1)); + CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 16], &gPlttBufferFaded[OBJ_PLTT_ID(1) + 4], PLTT_SIZEOF(1)); + CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 32], &gPlttBufferFaded[OBJ_PLTT_ID(1) + 10], PLTT_SIZEOF(1)); sprite->sTimer++; } else diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 7593a296e..05b5a3a05 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -998,13 +998,13 @@ void CycleSceneryPalette(u8 mode) break; if (gMain.vblankCounter1 & 4) { - x = gPlttBufferUnfaded[9]; - y = gPlttBufferUnfaded[10]; + x = gPlttBufferUnfaded[BG_PLTT_ID(0) + 9]; + y = gPlttBufferUnfaded[BG_PLTT_ID(0) + 10]; } else { - x = gPlttBufferUnfaded[10]; - y = gPlttBufferUnfaded[9]; + x = gPlttBufferUnfaded[BG_PLTT_ID(0) + 10]; + y = gPlttBufferUnfaded[BG_PLTT_ID(0) + 9]; } LoadPalette(&x, BG_PLTT_ID(0) + 9, sizeof(x)); LoadPalette(&y, BG_PLTT_ID(0) + 10, sizeof(y)); diff --git a/src/link.c b/src/link.c index 06bde1e38..0894021b5 100644 --- a/src/link.c +++ b/src/link.c @@ -1650,7 +1650,7 @@ static void ErrorMsg_MoveCloserToPartner(void) DecompressAndLoadBgGfxUsingHeap(1, sWirelessLinkDisplayGfx, FALSE, 0, 0); CopyToBgTilemapBuffer(1, sWirelessLinkDisplayTilemap, 0, 0); CopyBgTilemapBufferToVram(1); - LoadPalette(sWirelessLinkDisplayPal, 0, 0x20); + LoadPalette(sWirelessLinkDisplayPal, BG_PLTT_ID(0), sizeof(sWirelessLinkDisplayPal)); FillWindowPixelBuffer(WIN_LINK_ERROR_TOP, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_LINK_ERROR_BOTTOM, PIXEL_FILL(0)); AddTextPrinterParameterized3(WIN_LINK_ERROR_TOP, FONT_SHORT_COPY_1, 2, 6, sTextColors, 0, gText_CommErrorEllipsis); diff --git a/src/list_menu.c b/src/list_menu.c index 546ec6f6c..e24442ca0 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -316,7 +316,7 @@ static void ListMenuDummyTask(u8 taskId) } -s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 drawMode, u16 tileNum, u16 palNum) +s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 drawMode, u16 tileNum, u16 palOffset) { switch (sMysteryGiftLinkMenu.state) { @@ -326,9 +326,9 @@ s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const str switch (drawMode) { case 2: - LoadUserWindowBorderGfx(sMysteryGiftLinkMenu.windowId, tileNum, palNum); + LoadUserWindowBorderGfx(sMysteryGiftLinkMenu.windowId, tileNum, palOffset); case 1: - DrawTextBorderOuter(sMysteryGiftLinkMenu.windowId, tileNum, palNum / 16); + DrawTextBorderOuter(sMysteryGiftLinkMenu.windowId, tileNum, palOffset / 16); break; } gMultiuseListMenuTemplate = *listMenuTemplate; diff --git a/src/mail.c b/src/mail.c index 575be7061..7cff48c8e 100644 --- a/src/mail.c +++ b/src/mail.c @@ -551,9 +551,7 @@ static bool8 MailReadBuildGraphics(void) break; case 9: if (FreeTempTileDataBuffersIfPossible()) - { return FALSE; - } break; case 10: FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT); @@ -567,23 +565,20 @@ static bool8 MailReadBuildGraphics(void) break; case 12: LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(15), PLTT_SIZE_4BPP); + gPlttBufferUnfaded[BG_PLTT_ID(15) + 10] = sMailGraphics[sMailRead->mailType].textColor; + gPlttBufferFaded[BG_PLTT_ID(15) + 10] = sMailGraphics[sMailRead->mailType].textColor; + gPlttBufferUnfaded[BG_PLTT_ID(15) + 11] = sMailGraphics[sMailRead->mailType].textShadow; + gPlttBufferFaded[BG_PLTT_ID(15) + 11] = sMailGraphics[sMailRead->mailType].textShadow; - gPlttBufferUnfaded[250] = sMailGraphics[sMailRead->mailType].textColor; - gPlttBufferFaded[250] = sMailGraphics[sMailRead->mailType].textColor; - gPlttBufferUnfaded[251] = sMailGraphics[sMailRead->mailType].textShadow; - gPlttBufferFaded[251] = sMailGraphics[sMailRead->mailType].textShadow; LoadPalette(sMailGraphics[sMailRead->mailType].palette, BG_PLTT_ID(0), PLTT_SIZE_4BPP); - - gPlttBufferUnfaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0]; - gPlttBufferFaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0]; - gPlttBufferUnfaded[11] = sBgColors[gSaveBlock2Ptr->playerGender][1]; - gPlttBufferFaded[11] = sBgColors[gSaveBlock2Ptr->playerGender][1]; + gPlttBufferUnfaded[BG_PLTT_ID(0) + 10] = sBgColors[gSaveBlock2Ptr->playerGender][0]; + gPlttBufferFaded[BG_PLTT_ID(0) + 10] = sBgColors[gSaveBlock2Ptr->playerGender][0]; + gPlttBufferUnfaded[BG_PLTT_ID(0) + 11] = sBgColors[gSaveBlock2Ptr->playerGender][1]; + gPlttBufferFaded[BG_PLTT_ID(0) + 11] = sBgColors[gSaveBlock2Ptr->playerGender][1]; break; case 13: if (sMailRead->hasText) - { BufferMailText(); - } break; case 14: if (sMailRead->hasText) diff --git a/src/main_menu.c b/src/main_menu.c index 377cd635c..ce366faef 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1086,8 +1086,8 @@ static void Task_HandleMainMenuAPressed(u8 taskId) case ACTION_INVALID: gTasks[taskId].tCurrItem = 0; gTasks[taskId].func = Task_DisplayMainMenuInvalidActionError; - gPlttBufferUnfaded[0xF1] = RGB_WHITE; - gPlttBufferFaded[0xF1] = RGB_WHITE; + gPlttBufferUnfaded[BG_PLTT_ID(15) + 1] = RGB_WHITE; + gPlttBufferFaded[BG_PLTT_ID(15) + 1] = RGB_WHITE; SetGpuReg(REG_OFFSET_BG2HOFS, 0); SetGpuReg(REG_OFFSET_BG2VOFS, 0); SetGpuReg(REG_OFFSET_BG1HOFS, 0); diff --git a/src/mirage_tower.c b/src/mirage_tower.c index 01b87393a..f9806e776 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -8,6 +8,7 @@ #include "gpu_regs.h" #include "menu.h" #include "random.h" +#include "palette.h" #include "palette_util.h" #include "script.h" #include "sound.h" @@ -163,7 +164,7 @@ static const struct SpriteTemplate sSpriteTemplate_FallingFossil = const struct PulseBlendSettings gMirageTowerPulseBlendSettings = { .blendColor = RGB(27, 25, 16), - .paletteOffset = 0x61, + .paletteOffset = BG_PLTT_ID(6) + 1, .numColors = 15, .delay = 5, .numFadeCycles = -1, diff --git a/src/naming_screen.c b/src/naming_screen.c index 14a75166f..3962f141a 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -978,10 +978,10 @@ static u16 GetButtonPalOffset(u8 button) { const u16 palOffsets[BUTTON_COUNT + 1] = { - [BUTTON_PAGE] = IndexOfSpritePaletteTag(PALTAG_PAGE_SWAP) * 16 + 0x10E, - [BUTTON_BACK] = IndexOfSpritePaletteTag(PALTAG_BACK_BUTTON) * 16 + 0x10E, - [BUTTON_OK] = IndexOfSpritePaletteTag(PALTAG_OK_BUTTON) * 16 + 0x10E, - [BUTTON_COUNT] = IndexOfSpritePaletteTag(PALTAG_OK_BUTTON) * 16 + 0x101, + [BUTTON_PAGE] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_PAGE_SWAP)) + 14, + [BUTTON_BACK] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_BACK_BUTTON)) + 14, + [BUTTON_OK] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_OK_BUTTON)) + 14, + [BUTTON_COUNT] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_OK_BUTTON)) + 1, }; return palOffsets[button]; @@ -1051,7 +1051,7 @@ static void SpriteCB_Cursor(struct Sprite *sprite) { s8 gb = sprite->sColor; s8 r = sprite->sColor >> 1; - u16 index = IndexOfSpritePaletteTag(PALTAG_CURSOR) * 16 + 0x0101; + u16 index = OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_CURSOR)) + 1; MultiplyInvertedPaletteRGBComponents(index, r, gb, gb); } diff --git a/src/palette.c b/src/palette.c index 577257eff..6ce47a493 100644 --- a/src/palette.c +++ b/src/palette.c @@ -64,7 +64,7 @@ static EWRAM_DATA struct PaletteStruct sPaletteStructs[NUM_PALETTE_STRUCTS] = {0 EWRAM_DATA struct PaletteFadeControl gPaletteFade = {0}; static EWRAM_DATA u32 sFiller = 0; static EWRAM_DATA u32 sPlttBufferTransferPending = 0; -EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_DECOMP_BUFFER_SIZE] = {0}; +EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_SIZE] = {0}; static const struct PaletteStructTemplate sDummyPaletteStructTemplate = { .id = 0xFFFF, @@ -148,7 +148,7 @@ static void ReadPlttIntoBuffers(void) u16 i; u16 *pltt = (u16 *)PLTT; - for (i = 0; i < PLTT_SIZE / 2; i++) + for (i = 0; i < PLTT_BUFFER_SIZE; i++) { gPlttBufferUnfaded[i] = pltt[i]; gPlttBufferFaded[i] = pltt[i]; @@ -592,13 +592,13 @@ static u8 UpdateFastPaletteFade(void) if (gPaletteFade.objPaletteToggle) { - paletteOffsetStart = 256; - paletteOffsetEnd = 512; + paletteOffsetStart = OBJ_PLTT_OFFSET; + paletteOffsetEnd = PLTT_BUFFER_SIZE; } else { paletteOffsetStart = 0; - paletteOffsetEnd = 256; + paletteOffsetEnd = OBJ_PLTT_OFFSET; } switch (gPaletteFade_submode) diff --git a/src/party_menu.c b/src/party_menu.c index 27f4e0da4..68d7b058e 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -779,11 +779,11 @@ static bool8 AllocPartyMenuBgGfx(void) return FALSE; } -static void PartyPaletteBufferCopy(u8 offset) +static void PartyPaletteBufferCopy(u8 palNum) { - offset *= 16; - CpuCopy16(&gPlttBufferUnfaded[0x30], &gPlttBufferUnfaded[offset], 32); - CpuCopy16(&gPlttBufferUnfaded[0x30], &gPlttBufferFaded[offset], 32); + u8 offset = PLTT_ID(palNum); + CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(3)], &gPlttBufferUnfaded[offset], PLTT_SIZE_4BPP); + CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(3)], &gPlttBufferFaded[offset], PLTT_SIZE_4BPP); } static void FreePartyPointers(void) @@ -2192,16 +2192,16 @@ static void DrawEmptySlot(u8 windowId) BlitBitmapToPartyWindow(windowId, sSlotTilemap_WideEmpty, 18, 0, 0, 18, 3); } -#define LOAD_PARTY_BOX_PAL(paletteIds, paletteOffsets) \ -{ \ - LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[0]), paletteOffsets[0] + palNum, PLTT_SIZEOF(1)); \ - LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[1]), paletteOffsets[1] + palNum, PLTT_SIZEOF(1)); \ - LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[2]), paletteOffsets[2] + palNum, PLTT_SIZEOF(1)); \ +#define LOAD_PARTY_BOX_PAL(paletteIds, paletteOffsets) \ +{ \ + LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[0]), paletteOffsets[0] + palOffset, PLTT_SIZEOF(1)); \ + LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[1]), paletteOffsets[1] + palOffset, PLTT_SIZEOF(1)); \ + LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[2]), paletteOffsets[2] + palOffset, PLTT_SIZEOF(1)); \ } static void LoadPartyBoxPalette(struct PartyMenuBox *menuBox, u8 palFlags) { - u8 palNum = GetWindowAttribute(menuBox->windowId, WINDOW_PALETTE_NUM) * 16; + u8 palOffset = BG_PLTT_ID(GetWindowAttribute(menuBox->windowId, WINDOW_PALETTE_NUM)); if (palFlags & PARTY_PAL_NO_MON) { @@ -2329,7 +2329,7 @@ static void DisplayPartyPokemonGenderNidoranCheck(struct Pokemon *mon, struct Pa static void DisplayPartyPokemonGender(u8 gender, u16 species, u8 *nickname, struct PartyMenuBox *menuBox) { - u8 palNum = GetWindowAttribute(menuBox->windowId, WINDOW_PALETTE_NUM) * 16; + u8 palOffset = BG_PLTT_ID(GetWindowAttribute(menuBox->windowId, WINDOW_PALETTE_NUM)); if (species == SPECIES_NONE) return; @@ -2338,13 +2338,13 @@ static void DisplayPartyPokemonGender(u8 gender, u16 species, u8 *nickname, stru switch (gender) { case MON_MALE: - LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[0]), sGenderPalOffsets[0] + palNum, PLTT_SIZEOF(1)); - LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[1]), sGenderPalOffsets[1] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[0]), sGenderPalOffsets[0] + palOffset, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[1]), sGenderPalOffsets[1] + palOffset, PLTT_SIZEOF(1)); DisplayPartyPokemonBarDetail(menuBox->windowId, gText_MaleSymbol, 2, &menuBox->infoRects->dimensions[8]); break; case MON_FEMALE: - LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[0]), sGenderPalOffsets[0] + palNum, PLTT_SIZEOF(1)); - LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[1]), sGenderPalOffsets[1] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[0]), sGenderPalOffsets[0] + palOffset, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[1]), sGenderPalOffsets[1] + palOffset, PLTT_SIZEOF(1)); DisplayPartyPokemonBarDetail(menuBox->windowId, gText_FemaleSymbol, 2, &menuBox->infoRects->dimensions[8]); break; } @@ -2417,23 +2417,23 @@ static void DisplayPartyPokemonHPBarCheck(struct Pokemon *mon, struct PartyMenuB static void DisplayPartyPokemonHPBar(u16 hp, u16 maxhp, struct PartyMenuBox *menuBox) { - u8 palNum = GetWindowAttribute(menuBox->windowId, WINDOW_PALETTE_NUM) * 16; + u8 palOffset = BG_PLTT_ID(GetWindowAttribute(menuBox->windowId, WINDOW_PALETTE_NUM)); u8 hpFraction; switch (GetHPBarLevel(hp, maxhp)) { case HP_BAR_GREEN: case HP_BAR_FULL: - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[0]), sHPBarPalOffsets[0] + palNum, PLTT_SIZEOF(1)); - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[1]), sHPBarPalOffsets[1] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[0]), sHPBarPalOffsets[0] + palOffset, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[1]), sHPBarPalOffsets[1] + palOffset, PLTT_SIZEOF(1)); break; case HP_BAR_YELLOW: - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[0]), sHPBarPalOffsets[0] + palNum, PLTT_SIZEOF(1)); - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[1]), sHPBarPalOffsets[1] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[0]), sHPBarPalOffsets[0] + palOffset, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[1]), sHPBarPalOffsets[1] + palOffset, PLTT_SIZEOF(1)); break; default: - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[0]), sHPBarPalOffsets[0] + palNum, PLTT_SIZEOF(1)); - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[1]), sHPBarPalOffsets[1] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[0]), sHPBarPalOffsets[0] + palOffset, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[1]), sHPBarPalOffsets[1] + palOffset, PLTT_SIZEOF(1)); break; } diff --git a/src/pokedex.c b/src/pokedex.c index 2388626ff..5b0414513 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -93,6 +93,13 @@ enum NAME_YZ, }; +enum { + WIN_INFO, + WIN_FOOTPRINT, + WIN_CRY_WAVE, + WIN_VU_METER, +}; + // For scrolling search parameter #define MAX_SEARCH_PARAM_ON_SCREEN 6 #define MAX_SEARCH_PARAM_CURSOR_POS (MAX_SEARCH_PARAM_ON_SCREEN - 1) @@ -888,11 +895,6 @@ static const struct BgTemplate sInfoScreen_BgTemplate[] = } }; -#define WIN_INFO 0 -#define WIN_FOOTPRINT 1 -#define WIN_CRY_WAVE 2 -#define WIN_VU_METER 3 - static const struct WindowTemplate sInfoScreen_WindowTemplates[] = { [WIN_INFO] = @@ -3264,7 +3266,7 @@ static void Task_LoadInfoScreen(u8 taskId) case 4: PrintMonInfo(sPokedexListItem->dexNum, sPokedexView->dexMode == DEX_MODE_HOENN ? FALSE : TRUE, sPokedexListItem->owned, 0); if (!sPokedexListItem->owned) - LoadPalette(gPlttBufferUnfaded + 1, BG_PLTT_ID(3) + 1, PLTT_SIZEOF(16 - 1)); + LoadPalette(&gPlttBufferUnfaded[BG_PLTT_ID(0) + 1], BG_PLTT_ID(3) + 1, PLTT_SIZEOF(16 - 1)); CopyWindowToVram(WIN_INFO, COPYWIN_FULL); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); @@ -4527,28 +4529,38 @@ static void PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top) PrintInfoSubMenuText(windowId, str, left, top); } +// The footprints are drawn on WIN_FOOTPRINT, which uses BG palette 15 (loaded with graphics/text_window/message_box.gbapal) +// The footprint pixels are stored as 1BPP, and set to the below color index in this palette when converted to 4BPP. +#define FOOTPRINT_COLOR_IDX 2 + +#define NUM_FOOTPRINT_TILES 4 + static void DrawFootprint(u8 windowId, u16 dexNum) { - u8 footprint[32 * 4] = {0}; + u8 footprint4bpp[TILE_SIZE_4BPP * NUM_FOOTPRINT_TILES] = {0}; const u8 *footprintGfx = gMonFootprintTable[NationalPokedexNumToSpecies(dexNum)]; u32 i, j, tileIdx = 0; if (footprintGfx != NULL) { - for (i = 0; i < 32; i++) + for (i = 0; i < TILE_SIZE_1BPP * NUM_FOOTPRINT_TILES; i++) { - u8 tile = footprintGfx[i]; + u8 footprint1bpp = footprintGfx[i]; + + // Convert the 8 pixels in the above 1BPP byte to 4BPP. + // Each iteration creates one 4BPP byte (2 pixels), + // so we need 4 iterations to do all 8 pixels. for (j = 0; j < 4; j++) { - u8 value = ((tile >> (2 * j)) & 1 ? 2 : 0); - if (tile & (2 << (2 * j))) - value |= 0x20; - footprint[tileIdx] = value; + u8 tile = ((footprint1bpp >> (2 * j)) & 1 ? 2 : 0); + if (footprint1bpp & (2 << (2 * j))) + tile |= FOOTPRINT_COLOR_IDX << 4; // Set pixel + footprint4bpp[tileIdx] = tile; tileIdx++; } } } - CopyToWindowPixelBuffer(windowId, footprint, sizeof(footprint), 0); + CopyToWindowPixelBuffer(windowId, footprint4bpp, sizeof(footprint4bpp), 0); } // Unused Ruby/Sapphire function. diff --git a/src/pokedex_area_region_map.c b/src/pokedex_area_region_map.c index ff32f8eef..da50f8c68 100644 --- a/src/pokedex_area_region_map.c +++ b/src/pokedex_area_region_map.c @@ -41,7 +41,7 @@ void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template) ChangeBgX(template->bg, 0, BG_COORD_SET); ChangeBgY(template->bg, 0, BG_COORD_SET); SetBgAttribute(template->bg, BG_ATTR_PALETTEMODE, 1); - CpuCopy32(sPokedexAreaMap_Pal, &gPlttBufferUnfaded[0x70], sizeof(sPokedexAreaMap_Pal)); + CpuCopy32(sPokedexAreaMap_Pal, &gPlttBufferUnfaded[BG_PLTT_ID(7)], sizeof(sPokedexAreaMap_Pal)); *sPokedexAreaMapBgNum = template->bg; } diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index 01cbacb44..f9181a985 100755 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -224,7 +224,7 @@ static bool8 DrawAreaGlow(void) case 3: if (!FreeTempTileDataBuffersIfPossible()) { - CpuCopy32(sAreaGlow_Pal, &gPlttBufferUnfaded[GLOW_PALETTE * 16], sizeof(sAreaGlow_Pal)); + CpuCopy32(sAreaGlow_Pal, &gPlttBufferUnfaded[BG_PLTT_ID(GLOW_PALETTE)], sizeof(sAreaGlow_Pal)); sPokedexAreaScreen->drawAreaGlowState++; } return TRUE; diff --git a/src/pokemon.c b/src/pokemon.c index 7bd4e19b3..c02802be2 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1910,10 +1910,10 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = const struct SpindaSpot gSpindaSpotGraphics[] = { - {.x = 16, .y = 7, .image = INCBIN_U16("graphics/spinda_spots/spot_0.bin")}, - {.x = 40, .y = 8, .image = INCBIN_U16("graphics/spinda_spots/spot_1.bin")}, - {.x = 22, .y = 25, .image = INCBIN_U16("graphics/spinda_spots/spot_2.bin")}, - {.x = 34, .y = 26, .image = INCBIN_U16("graphics/spinda_spots/spot_3.bin")} + {.x = 16, .y = 7, .image = INCBIN_U16("graphics/spinda_spots/spot_0.1bpp")}, + {.x = 40, .y = 8, .image = INCBIN_U16("graphics/spinda_spots/spot_1.1bpp")}, + {.x = 22, .y = 25, .image = INCBIN_U16("graphics/spinda_spots/spot_2.1bpp")}, + {.x = 34, .y = 26, .image = INCBIN_U16("graphics/spinda_spots/spot_3.1bpp")} }; #include "data/pokemon/item_effects.h" diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index bd46e8767..9255e1c03 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -2867,16 +2867,12 @@ const u8 *GetMonIconTiles(u16 species, u32 personality) void TryLoadAllMonIconPalettesAtOffset(u16 offset) { s32 i; - const struct SpritePalette* monIconPalettePtr; - - if (offset <= BG_PLTT_ID(10)) + if (offset <= BG_PLTT_ID(16 - ARRAY_COUNT(gMonIconPaletteTable))) { - monIconPalettePtr = gMonIconPaletteTable; - for (i = ARRAY_COUNT(gMonIconPaletteTable) - 1; i >= 0; i--) + for (i = 0; i < (int)ARRAY_COUNT(gMonIconPaletteTable); i++) { - LoadPalette(monIconPalettePtr->data, offset, PLTT_SIZE_4BPP); - offset += 0x10; - monIconPalettePtr++; + LoadPalette(gMonIconPaletteTable[i].data, offset, PLTT_SIZE_4BPP); + offset += 16; } } } diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 1224a7dbe..50f315abd 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -5528,7 +5528,7 @@ static void InitBoxTitle(u8 boxId) tagIndex = IndexOfSpritePaletteTag(PALTAG_BOX_TITLE); sStorage->boxTitlePalOffset = OBJ_PLTT_ID(tagIndex) + 14; - sStorage->wallpaperPalBits |= 0x10000 << tagIndex; + sStorage->wallpaperPalBits |= (1 << 16) << tagIndex; // The below seems intended to have separately tracked // the incoming wallpaper title's palette, but as they now @@ -5536,7 +5536,7 @@ static void InitBoxTitle(u8 boxId) // this is redundant along with the use of boxTitleAltPalOffset tagIndex = IndexOfSpritePaletteTag(PALTAG_BOX_TITLE); sStorage->boxTitleAltPalOffset = OBJ_PLTT_ID(tagIndex) + 14; - sStorage->wallpaperPalBits |= 0x10000 << tagIndex; + sStorage->wallpaperPalBits |= (1 << 16) << tagIndex; StringCopyPadded(sStorage->boxTitleText, GetBoxNamePtr(boxId), 0, BOX_NAME_LENGTH); DrawTextWindowAndBufferTiles(sStorage->boxTitleText, sStorage->boxTitleTiles, 0, 0, 2); @@ -5654,9 +5654,9 @@ static void CycleBoxTitleColor(void) u8 boxId = StorageGetCurrentBox(); u8 wallpaperId = GetBoxWallpaper(boxId); if (sStorage->boxTitleCycleId == 0) - CpuCopy16(sBoxTitleColors[wallpaperId], gPlttBufferUnfaded + sStorage->boxTitlePalOffset, 4); + CpuCopy16(sBoxTitleColors[wallpaperId], &gPlttBufferUnfaded[sStorage->boxTitlePalOffset], PLTT_SIZEOF(2)); else - CpuCopy16(sBoxTitleColors[wallpaperId], gPlttBufferUnfaded + sStorage->boxTitleAltPalOffset, 4); + CpuCopy16(sBoxTitleColors[wallpaperId], &gPlttBufferUnfaded[sStorage->boxTitleAltPalOffset], PLTT_SIZEOF(2)); } static s16 GetBoxTitleBaseX(const u8 *string) @@ -8794,8 +8794,7 @@ static void CreateItemIconSprites(void) LoadCompressedSpriteSheet(&spriteSheet); sStorage->itemIcons[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * TILE_SIZE_4BPP + (void *)(OBJ_VRAM0); sStorage->itemIcons[i].palIndex = AllocSpritePalette(PALTAG_ITEM_ICON_0 + i); - sStorage->itemIcons[i].palIndex *= 16; - sStorage->itemIcons[i].palIndex += 0x100; + sStorage->itemIcons[i].palIndex = OBJ_PLTT_ID(sStorage->itemIcons[i].palIndex); spriteTemplate.tileTag = GFXTAG_ITEM_ICON_0 + i; spriteTemplate.paletteTag = PALTAG_ITEM_ICON_0 + i; spriteId = CreateSprite(&spriteTemplate, 0, 0, 11); diff --git a/src/pokenav_conditions_search_results.c b/src/pokenav_conditions_search_results.c index db2422030..24fe966dc 100644 --- a/src/pokenav_conditions_search_results.c +++ b/src/pokenav_conditions_search_results.c @@ -432,7 +432,7 @@ static u32 LoopedTask_OpenConditionSearchResults(s32 state) SetBgTilemapBuffer(1, gfx->buff); CopyToBgTilemapBuffer(1, sConditionSearchResultTilemap, 0, 0); CopyBgTilemapBufferToVram(1); - CopyPaletteIntoBufferUnfaded(sConditionSearchResultFramePal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sConditionSearchResultFramePal, BG_PLTT_ID(1), sizeof(sConditionSearchResultFramePal)); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 1: @@ -444,7 +444,7 @@ static u32 LoopedTask_OpenConditionSearchResults(s32 state) case 2: if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; - CopyPaletteIntoBufferUnfaded(sListBg_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sListBg_Pal, BG_PLTT_ID(2), sizeof(sListBg_Pal)); CreateSearchResultsList(); return LT_INC_AND_PAUSE; case 3: diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index bfc5ba0cb..761f572d6 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -443,7 +443,7 @@ static u32 LoopedTask_SlideMenuHeaderDown(s32 state) void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) { - CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); + CpuCopy16(palette, &gPlttBufferUnfaded[bufferOffset], size); } void Pokenav_AllocAndLoadPalettes(const struct SpritePalette *palettes) @@ -468,7 +468,7 @@ void Pokenav_AllocAndLoadPalettes(const struct SpritePalette *palettes) void PokenavFillPalette(u32 palIndex, u16 fillValue) { - CpuFill16(fillValue, gPlttBufferFaded + 0x100 + (palIndex * 16), 16 * sizeof(u16)); + CpuFill16(fillValue, &gPlttBufferFaded[OBJ_PLTT_ID(palIndex)], PLTT_SIZE_4BPP); } void PokenavCopyPalette(const u16 *src, const u16 *dest, int size, int a3, int a4, u16 *palette) diff --git a/src/pokenav_match_call_gfx.c b/src/pokenav_match_call_gfx.c index 1747d3ef0..4271e2ff2 100755 --- a/src/pokenav_match_call_gfx.c +++ b/src/pokenav_match_call_gfx.c @@ -333,7 +333,7 @@ static u32 LoopedTask_OpenMatchCall(s32 state) SetBgTilemapBuffer(2, gfx->bgTilemapBuffer2); CopyToBgTilemapBuffer(2, sMatchCallUI_Tilemap, 0, 0); CopyBgTilemapBufferToVram(2); - CopyPaletteIntoBufferUnfaded(sMatchCallUI_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMatchCallUI_Pal, BG_PLTT_ID(2), sizeof(sMatchCallUI_Pal)); CopyBgTilemapBufferToVram(2); return LT_INC_AND_PAUSE; case 1: @@ -343,7 +343,7 @@ static u32 LoopedTask_OpenMatchCall(s32 state) BgDmaFill(1, 0, 0, 1); SetBgTilemapBuffer(1, gfx->bgTilemapBuffer1); FillBgTilemapBufferRect_Palette0(1, 0x1000, 0, 0, 32, 20); - CopyPaletteIntoBufferUnfaded(sCallWindow_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sCallWindow_Pal, BG_PLTT_ID(1), sizeof(sCallWindow_Pal)); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 2: @@ -352,7 +352,7 @@ static u32 LoopedTask_OpenMatchCall(s32 state) LoadCallWindowAndFade(gfx); DecompressAndCopyTileDataToVram(3, sPokeball_Gfx, 0, 0, 0); - CopyPaletteIntoBufferUnfaded(sListWindow_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sListWindow_Pal, BG_PLTT_ID(3), sizeof(sListWindow_Pal)); CopyPaletteIntoBufferUnfaded(sPokeball_Pal, BG_PLTT_ID(5), PLTT_SIZE_4BPP); return LT_INC_AND_PAUSE; case 3: @@ -913,9 +913,9 @@ static void Task_FlashPokeballIcons(u8 taskId) tSinIdx += 4; tSinIdx &= 0x7F; tSinVal = gSineTable[tSinIdx] >> 4; - PokenavCopyPalette(sPokeball_Pal, &sPokeball_Pal[0x10], 0x10, 0x10, tSinVal, &gPlttBufferUnfaded[0x50]); + PokenavCopyPalette(sPokeball_Pal, &sPokeball_Pal[0x10], 0x10, 0x10, tSinVal, &gPlttBufferUnfaded[BG_PLTT_ID(5)]); if (!gPaletteFade.active) - CpuCopy32(&gPlttBufferUnfaded[0x50], &gPlttBufferFaded[0x50], 0x20); + CpuCopy32(&gPlttBufferUnfaded[BG_PLTT_ID(5)], &gPlttBufferFaded[BG_PLTT_ID(5)], PLTT_SIZE_4BPP); } } diff --git a/src/pokenav_menu_handler_gfx.c b/src/pokenav_menu_handler_gfx.c index 0c664a0d0..dd18eb843 100644 --- a/src/pokenav_menu_handler_gfx.c +++ b/src/pokenav_menu_handler_gfx.c @@ -470,14 +470,14 @@ static u32 LoopedTask_OpenMenu(s32 state) return LT_PAUSE; DecompressAndCopyTileDataToVram(2, sPokenavDeviceBgTiles, 0, 0, 0); DecompressAndCopyTileDataToVram(2, sPokenavDeviceBgTilemap, 0, 0, 1); - CopyPaletteIntoBufferUnfaded(sPokenavDeviceBgPal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sPokenavDeviceBgPal, BG_PLTT_ID(2), sizeof(sPokenavDeviceBgPal)); return LT_INC_AND_PAUSE; case 2: if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; DecompressAndCopyTileDataToVram(3, sPokenavBgDotsTiles, 0, 0, 0); DecompressAndCopyTileDataToVram(3, sPokenavBgDotsTilemap, 0, 0, 1); - CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal, BG_PLTT_ID(3), sizeof(sPokenavBgDotsPal)); if (GetPokenavMenuType() == POKENAV_MENU_TYPE_CONDITION || GetPokenavMenuType() == POKENAV_MENU_TYPE_CONDITION_SEARCH) ChangeBgDotsColorToPurple(); return LT_INC_AND_PAUSE; diff --git a/src/pokenav_region_map.c b/src/pokenav_region_map.c index 50f01345c..e589e2818 100755 --- a/src/pokenav_region_map.c +++ b/src/pokenav_region_map.c @@ -515,7 +515,7 @@ static void LoadPokenavRegionMapGfx(struct Pokenav_RegionMapGfx *state) FillWindowPixelBuffer(state->infoWindowId, PIXEL_FILL(1)); PutWindowTilemap(state->infoWindowId); CopyWindowToVram(state->infoWindowId, COPYWIN_FULL); - CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, BG_PLTT_ID(1), sizeof(sMapSecInfoWindow_Pal)); CopyPaletteIntoBufferUnfaded(gRegionMapCityZoomTiles_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); if (!IsRegionMapZoomed()) ChangeBgY(1, -0x6000, BG_COORD_SET); diff --git a/src/pokenav_ribbons_list.c b/src/pokenav_ribbons_list.c index 075bcc7ce..56492b4ec 100644 --- a/src/pokenav_ribbons_list.c +++ b/src/pokenav_ribbons_list.c @@ -432,7 +432,7 @@ static u32 LoopedTask_OpenRibbonsMonList(s32 state) DecompressAndCopyTileDataToVram(1, sMonRibbonListFrameTiles, 0, 0, 0); SetBgTilemapBuffer(1, menu->buff); CopyToBgTilemapBuffer(1, sMonRibbonListFrameTilemap, 0, 0); - CopyPaletteIntoBufferUnfaded(sMonRibbonListFramePal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMonRibbonListFramePal, BG_PLTT_ID(1), sizeof(sMonRibbonListFramePal)); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 1: @@ -447,7 +447,7 @@ static u32 LoopedTask_OpenRibbonsMonList(s32 state) case 2: if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; - CopyPaletteIntoBufferUnfaded(sMonRibbonListUi_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMonRibbonListUi_Pal, BG_PLTT_ID(2), sizeof(sMonRibbonListUi_Pal)); CreateRibbonMonsList(); return LT_INC_AND_PAUSE; case 3: diff --git a/src/pokenav_ribbons_summary.c b/src/pokenav_ribbons_summary.c index f9432c834..f2e589e56 100644 --- a/src/pokenav_ribbons_summary.c +++ b/src/pokenav_ribbons_summary.c @@ -584,7 +584,7 @@ static u32 LoopedTask_OpenRibbonsSummaryMenu(s32 state) SetBgTilemapBuffer(1, menu->tilemapBuffers[1]); FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 32, 20); CopyPaletteIntoBufferUnfaded(sRibbonIcons1_Pal, BG_PLTT_ID(2), 5 * PLTT_SIZE_4BPP); - CopyPaletteIntoBufferUnfaded(sMonInfo_Pal, BG_PLTT_ID(10), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMonInfo_Pal, BG_PLTT_ID(10), sizeof(sMonInfo_Pal)); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; } diff --git a/src/region_map.c b/src/region_map.c index ebe3afb8e..f6123359b 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -621,7 +621,7 @@ bool8 LoadRegionMapGfx(void) void BlendRegionMap(u16 color, u32 coeff) { BlendPalettes(0x380, coeff, color); - CpuCopy16(gPlttBufferFaded + 0x70, gPlttBufferUnfaded + 0x70, 0x60); + CpuCopy16(&gPlttBufferFaded[BG_PLTT_ID(7)], &gPlttBufferUnfaded[BG_PLTT_ID(7)], 3 * PLTT_SIZE_4BPP); } void FreeRegionMapIconResources(void) diff --git a/src/roulette.c b/src/roulette.c index 06561f798..d311ad094 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -860,7 +860,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + { { // F_FLASH_COLOR_O_WYNAUT .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x5, + .paletteOffset = BG_PLTT_ID(0) + 5, .numColors = 1, .delay = 1, .unk6 = -1, @@ -870,7 +870,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_G_AZURILL .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0xA, + .paletteOffset = BG_PLTT_ID(0) + 10, .numColors = 1, .delay = 1, .unk6 = -1, @@ -880,7 +880,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_P_SKITTY .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x15, + .paletteOffset = BG_PLTT_ID(1) + 5, .numColors = 1, .delay = 1, .unk6 = -1, @@ -890,7 +890,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_O_MAKUHITA .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x55, + .paletteOffset = BG_PLTT_ID(5) + 5, .numColors = 1, .delay = 1, .unk6 = -1, @@ -900,7 +900,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_G_WYNAUT .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x5A, + .paletteOffset = BG_PLTT_ID(5) + 10, .numColors = 1, .delay = 1, .unk6 = -1, @@ -910,7 +910,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_P_AZURILL .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x65, + .paletteOffset = BG_PLTT_ID(6) + 5, .numColors = 1, .delay = 1, .unk6 = -1, @@ -920,7 +920,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_O_SKITTY .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x75, + .paletteOffset = BG_PLTT_ID(7) + 5, .numColors = 1, .delay = 1, .unk6 = -1, @@ -930,7 +930,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_G_MAKUHITA .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x7A, + .paletteOffset = BG_PLTT_ID(7) + 10, .numColors = 1, .delay = 1, .unk6 = -1, @@ -940,7 +940,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_P_WYNAUT .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x85, + .paletteOffset = BG_PLTT_ID(8) + 5, .numColors = 1, .delay = 1, .unk6 = -1, @@ -950,7 +950,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_O_AZURILL .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x95, + .paletteOffset = BG_PLTT_ID(9) + 5, .numColors = 1, .delay = 1, .unk6 = -1, @@ -960,7 +960,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_G_SKITTY .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0x9A, + .paletteOffset = BG_PLTT_ID(9) + 10, .numColors = 1, .delay = 1, .unk6 = -1, @@ -970,7 +970,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_COLOR_P_MAKUHITA .color = FLASHUTIL_USE_EXISTING_COLOR, - .paletteOffset = 0xA5, + .paletteOffset = BG_PLTT_ID(10) + 5, .numColors = 1, .delay = 1, .unk6 = -1, @@ -980,7 +980,7 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, { // F_FLASH_OUTER_EDGES .color = RGB(22, 30, 29), - .paletteOffset = 0x28, + .paletteOffset = BG_PLTT_ID(2) + 8, .numColors = 2, .delay = 10, .unk6 = -1, @@ -996,7 +996,7 @@ static const struct RouletteFlashSettings sFlashData_PokeIcons[NUM_BOARD_COLORS] { [GET_ROW_IDX(ROW_ORANGE)] = { .color = RGB(31, 31, 20), - .paletteOffset = 0x101, + .paletteOffset = OBJ_PLTT_ID(0) + 1, .numColors = 5, .delay = 30, .unk6 = -1, @@ -1006,7 +1006,7 @@ static const struct RouletteFlashSettings sFlashData_PokeIcons[NUM_BOARD_COLORS] }, [GET_ROW_IDX(ROW_GREEN)] = { .color = RGB(27, 31, 31), - .paletteOffset = 0x106, + .paletteOffset = OBJ_PLTT_ID(0) + 6, .numColors = 5, .delay = 30, .unk6 = -1, @@ -1016,7 +1016,7 @@ static const struct RouletteFlashSettings sFlashData_PokeIcons[NUM_BOARD_COLORS] }, [GET_ROW_IDX(ROW_PURPLE)] = { .color = RGB(31, 27, 31), - .paletteOffset = 0x10B, + .paletteOffset = OBJ_PLTT_ID(0) + 11, .numColors = 5, .delay = 30, .unk6 = -1, @@ -1129,9 +1129,9 @@ static void InitRouletteTableData(void) // Left table (with min bet of 1) has red background, other table has green if (sRoulette->minBet == 1) - gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = bgColors[0]; + gPlttBufferUnfaded[BG_PLTT_ID(0)] = gPlttBufferUnfaded[BG_PLTT_ID(5) + 1] = gPlttBufferFaded[BG_PLTT_ID(0)] = gPlttBufferFaded[BG_PLTT_ID(5) + 1] = bgColors[0]; else - gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = bgColors[1]; + gPlttBufferUnfaded[BG_PLTT_ID(0)] = gPlttBufferUnfaded[BG_PLTT_ID(5) + 1] = gPlttBufferFaded[BG_PLTT_ID(0)] = gPlttBufferFaded[BG_PLTT_ID(5) + 1] = bgColors[1]; RouletteFlash_Reset(&sRoulette->flashUtil); diff --git a/src/scrcmd.c b/src/scrcmd.c index 3a5a17fa8..98c20ef4e 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -650,12 +650,12 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx) case FADE_TO_BLACK: case FADE_TO_WHITE: default: - CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE); + CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_SIZE); FadeScreen(mode, 0); break; case FADE_FROM_BLACK: case FADE_FROM_WHITE: - CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE); + CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_SIZE); FadeScreen(mode, 0); break; } diff --git a/src/slot_machine.c b/src/slot_machine.c index 2fc0e2c03..581e5c78e 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -4427,7 +4427,7 @@ static void SpriteCB_ReelTimePikachuAura(struct Sprite *sprite) u8 colors[] = {16, 0}; if (sprite->sFlashPal && --sprite->sDelayTimer <= 0) { - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(PALTAG_PIKA_AURA) << 4) + 0x103, colors[sprite->sColorIdx], colors[sprite->sColorIdx], colors[sprite->sColorIdx]); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_PIKA_AURA)) + 3, colors[sprite->sColorIdx], colors[sprite->sColorIdx], colors[sprite->sColorIdx]); ++sprite->sColorIdx; sprite->sColorIdx &= 1; sprite->sDelayTimer = sprite->sDelay; @@ -4442,7 +4442,7 @@ static void SetReelTimePikachuAuraFlashDelay(s16 delay) static void DestroyReelTimePikachuAuraSprites(void) { u8 i; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(PALTAG_PIKA_AURA) << 4) + 0x103, 0, 0, 0); + MultiplyInvertedPaletteRGBComponents(OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_PIKA_AURA)) + 3, 0, 0, 0); for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimePikachuAuraSpriteIds); i++) DestroySprite(&gSprites[sSlotMachine->reelTimePikachuAuraSpriteIds[i]]); } diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 12701fb5f..595ba08a6 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -1167,7 +1167,7 @@ static void QueueAnimTiles_BattlePyramid_StatueShadow(u16 timer) static void BlendAnimPalette_BattleDome_FloorLights(u16 timer) { - CpuCopy16(sTilesetAnims_BattleDomeFloorLightPals[timer % ARRAY_COUNT(sTilesetAnims_BattleDomeFloorLightPals)], &gPlttBufferUnfaded[0x80], 32); + CpuCopy16(sTilesetAnims_BattleDomeFloorLightPals[timer % ARRAY_COUNT(sTilesetAnims_BattleDomeFloorLightPals)], &gPlttBufferUnfaded[BG_PLTT_ID(8)], PLTT_SIZE_4BPP); BlendPalette(BG_PLTT_ID(8), 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) != TASK_NONE) { @@ -1178,7 +1178,7 @@ static void BlendAnimPalette_BattleDome_FloorLights(u16 timer) static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16 timer) { - CpuCopy16(sTilesetAnims_BattleDomeFloorLightPals[timer % ARRAY_COUNT(sTilesetAnims_BattleDomeFloorLightPals)], &gPlttBufferUnfaded[0x80], 32); + CpuCopy16(sTilesetAnims_BattleDomeFloorLightPals[timer % ARRAY_COUNT(sTilesetAnims_BattleDomeFloorLightPals)], &gPlttBufferUnfaded[BG_PLTT_ID(8)], PLTT_SIZE_4BPP); if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) == TASK_NONE) { BlendPalette(BG_PLTT_ID(8), 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index b64ac4152..06df5d0a3 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -173,8 +173,8 @@ static EWRAM_DATA struct UsePokeblockMenu *sMenu = NULL; static const u32 sMonFrame_Pal[] = INCBIN_U32("graphics/pokeblock/use_screen/mon_frame_pal.bin"); static const u32 sMonFrame_Gfx[] = INCBIN_U32("graphics/pokeblock/use_screen/mon_frame.4bpp"); -static const u32 sMonFrame_Tilemap[] = INCBIN_U32("graphics/pokeblock/use_screen/mon_frame.bin"); -static const u32 sGraphData_Tilemap[] = INCBIN_U32("graphics/pokeblock/use_screen/graph_data.bin"); +static const u32 sMonFrame_Tilemap[] = INCBIN_U32("graphics/pokeblock/use_screen/mon_frame.bin.lz"); +static const u32 sGraphData_Tilemap[] = INCBIN_U32("graphics/pokeblock/use_screen/graph_data.bin.lz"); // The condition/flavors aren't listed in their normal order in this file, they're listed as shown on the graph going counter-clockwise // Normally they would go Cool/Spicy, Beauty/Dry, Cute/Sweet, Smart/Bitter, Tough/Sour (also graph order, but clockwise) diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index f80e2356e..8c8931211 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -222,7 +222,7 @@ static void CB2_InitWirelessCommunicationScreen(void) ChangeBgX(1, 0, BG_COORD_SET); ChangeBgY(1, 0, BG_COORD_SET); LoadPalette(sPalettes, BG_PLTT_ID(0), PLTT_SIZE_4BPP); - Menu_LoadStdPalAt(0xF0); + Menu_LoadStdPalAt(BG_PLTT_ID(15)); DynamicPlaceholderTextUtil_Reset(); FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 15); CopyBgTilemapBufferToVram(1); diff --git a/tools/gbagfx/convert_png.c b/tools/gbagfx/convert_png.c index a5fefbd8b..c9c240efb 100644 --- a/tools/gbagfx/convert_png.c +++ b/tools/gbagfx/convert_png.c @@ -130,7 +130,6 @@ void ReadPng(char *path, struct Image *image) FATAL_ERROR("Bit depth of image must be 1, 2, 4, or 8.\n"); image->pixels = ConvertBitDepth(image->pixels, bit_depth, image->bitDepth, image->width * image->height); free(src); - image->bitDepth = bit_depth; } } diff --git a/tools/gbagfx/gfx.c b/tools/gbagfx/gfx.c index 832e9bb39..1dfc38e2d 100644 --- a/tools/gbagfx/gfx.c +++ b/tools/gbagfx/gfx.c @@ -204,6 +204,18 @@ static void ConvertToTiles8Bpp(unsigned char *src, unsigned char *dest, int numT } } +// For untiled, plain images +static void CopyPlainPixels(unsigned char *src, unsigned char *dest, int size, int dataWidth, bool invertColors) +{ + if (dataWidth == 0) return; + for (int i = 0; i < size; i += dataWidth) { + for (int j = dataWidth; j > 0; j--) { + unsigned char pixels = src[i + j - 1]; + *dest++ = invertColors ? ~pixels : pixels; + } + } +} + static void DecodeAffineTilemap(unsigned char *input, unsigned char *output, unsigned char *tilemap, int tileSize, int numTiles) { for (int i = 0; i < numTiles; i++) @@ -345,9 +357,9 @@ static unsigned char *DecodeTilemap(unsigned char *tiles, struct Tilemap *tilema return decoded; } -void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors) +void ReadTileImage(char *path, int tilesWidth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors) { - int tileSize = bitDepth * 8; + int tileSize = image->bitDepth * 8; int fileSize; unsigned char *buffer = ReadWholeFile(path, &fileSize); @@ -355,26 +367,25 @@ void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int int numTiles = fileSize / tileSize; if (image->tilemap.data.affine != NULL) { - int outTileSize = (bitDepth == 4 && image->palette.numColors > 16) ? 64 : tileSize; - buffer = DecodeTilemap(buffer, &image->tilemap, &numTiles, image->isAffine, tileSize, outTileSize, bitDepth); + int outTileSize = (image->bitDepth == 4 && image->palette.numColors > 16) ? 64 : tileSize; + buffer = DecodeTilemap(buffer, &image->tilemap, &numTiles, image->isAffine, tileSize, outTileSize, image->bitDepth); if (outTileSize == 64) { tileSize = 64; - image->bitDepth = bitDepth = 8; + image->bitDepth = 8; } } int tilesHeight = (numTiles + tilesWidth - 1) / tilesWidth; if (tilesWidth % metatileWidth != 0) - FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)", tilesWidth, metatileWidth); + FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)\n", tilesWidth, metatileWidth); if (tilesHeight % metatileHeight != 0) - FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)", tilesHeight, metatileHeight); + FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)\n", tilesHeight, metatileHeight); image->width = tilesWidth * 8; image->height = tilesHeight * 8; - image->bitDepth = bitDepth; image->pixels = calloc(tilesWidth * tilesHeight, tileSize); if (image->pixels == NULL) @@ -382,7 +393,7 @@ void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int int metatilesWide = tilesWidth / metatileWidth; - switch (bitDepth) { + switch (image->bitDepth) { case 1: ConvertFromTiles1Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); break; @@ -397,9 +408,9 @@ void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int free(buffer); } -void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors) +void WriteTileImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors) { - int tileSize = bitDepth * 8; + int tileSize = image->bitDepth * 8; if (image->width % 8 != 0) FATAL_ERROR("The width in pixels (%d) isn't a multiple of 8.\n", image->width); @@ -411,10 +422,10 @@ void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bi int tilesHeight = image->height / 8; if (tilesWidth % metatileWidth != 0) - FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)", tilesWidth, metatileWidth); + FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)\n", tilesWidth, metatileWidth); if (tilesHeight % metatileHeight != 0) - FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)", tilesHeight, metatileHeight); + FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)\n", tilesHeight, metatileHeight); int maxNumTiles = tilesWidth * tilesHeight; @@ -432,7 +443,7 @@ void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bi int metatilesWide = tilesWidth / metatileWidth; - switch (bitDepth) { + switch (image->bitDepth) { case 1: ConvertToTiles1Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); break; @@ -468,6 +479,57 @@ void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bi free(buffer); } +void ReadPlainImage(char *path, int dataWidth, struct Image *image, bool invertColors) +{ + int fileSize; + unsigned char *buffer = ReadWholeFile(path, &fileSize); + + if (fileSize % dataWidth != 0) + FATAL_ERROR("The image data size (%d) isn't a multiple of the specified data width %d.\n", fileSize, dataWidth); + + // png scanlines have wasted bits if they do not align to byte boundaries. + // pngs misaligned in this way are not currently handled. + int pixelsPerByte = 8 / image->bitDepth; + if (image->width % pixelsPerByte != 0) + FATAL_ERROR("The width in pixels (%d) isn't a multiple of %d.\n", image->width, pixelsPerByte); + + int numPixels = fileSize * pixelsPerByte; + image->height = (numPixels + image->width - 1) / image->width; + image->pixels = calloc(image->width * image->height * image->bitDepth / 8, 1); + + if (image->pixels == NULL) + FATAL_ERROR("Failed to allocate memory for pixels.\n"); + + CopyPlainPixels(buffer, image->pixels, fileSize, dataWidth, invertColors); + + free(buffer); +} + +void WritePlainImage(char *path, int dataWidth, struct Image *image, bool invertColors) +{ + int bufferSize = image->width * image->height * image->bitDepth / 8; + + if (bufferSize % dataWidth != 0) + FATAL_ERROR("The image data size (%d) isn't a multiple of the specified data width %d.\n", bufferSize, dataWidth); + + // png scanlines have wasted bits if they do not align to byte boundaries. + // pngs misaligned in this way are not currently handled. + int pixelsPerByte = 8 / image->bitDepth; + if (image->width % pixelsPerByte != 0) + FATAL_ERROR("The width in pixels (%d) isn't a multiple of %d.\n", image->width, pixelsPerByte); + + unsigned char *buffer = malloc(bufferSize); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for pixels.\n"); + + CopyPlainPixels(image->pixels, buffer, bufferSize, dataWidth, invertColors); + + WriteWholeFile(path, buffer, bufferSize); + + free(buffer); +} + void FreeImage(struct Image *image) { if (image->tilemap.data.affine != NULL) diff --git a/tools/gbagfx/gfx.h b/tools/gbagfx/gfx.h index f1dbfcf4f..1797d84df 100644 --- a/tools/gbagfx/gfx.h +++ b/tools/gbagfx/gfx.h @@ -50,8 +50,10 @@ enum NumTilesMode { NUM_TILES_ERROR, }; -void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); -void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); +void ReadTileImage(char *path, int tilesWidth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); +void WriteTileImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); +void ReadPlainImage(char *path, int dataWidth, struct Image *image, bool invertColors); +void WritePlainImage(char *path, int dataWidth, struct Image *image, bool invertColors); void FreeImage(struct Image *image); void ReadGbaPalette(char *path, struct Palette *palette); void WriteGbaPalette(char *path, struct Palette *palette); diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c index 5d4faacab..98a1a1edf 100644 --- a/tools/gbagfx/main.c +++ b/tools/gbagfx/main.c @@ -25,6 +25,9 @@ void ConvertGbaToPng(char *inputPath, char *outputPath, struct GbaToPngOptions * { struct Image image; + image.bitDepth = options->bitDepth; + image.tilemap.data.affine = NULL; + if (options->paletteFilePath != NULL) { char *paletteFileExtension = GetFileExtensionAfterDot(options->paletteFilePath); @@ -45,22 +48,25 @@ void ConvertGbaToPng(char *inputPath, char *outputPath, struct GbaToPngOptions * image.hasPalette = false; } - if (options->tilemapFilePath != NULL) + if (options->isTiled) { - int fileSize; - image.tilemap.data.affine = ReadWholeFile(options->tilemapFilePath, &fileSize); - if (options->isAffineMap && options->bitDepth != 8) - FATAL_ERROR("affine maps are necessarily 8bpp\n"); - image.isAffine = options->isAffineMap; - image.tilemap.size = fileSize; + if (options->tilemapFilePath != NULL) + { + int fileSize; + image.tilemap.data.affine = ReadWholeFile(options->tilemapFilePath, &fileSize); + if (options->isAffineMap && options->bitDepth != 8) + FATAL_ERROR("affine maps are necessarily 8bpp\n"); + image.isAffine = options->isAffineMap; + image.tilemap.size = fileSize; + } + ReadTileImage(inputPath, options->width, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette); } else { - image.tilemap.data.affine = NULL; + image.width = options->width; + ReadPlainImage(inputPath, options->dataWidth, &image, !image.hasPalette); } - ReadImage(inputPath, options->width, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette); - image.hasTransparency = options->hasTransparency; WritePng(outputPath, &image); @@ -77,7 +83,10 @@ void ConvertPngToGba(char *inputPath, char *outputPath, struct PngToGbaOptions * ReadPng(inputPath, &image); - WriteImage(outputPath, options->numTilesMode, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette); + if (options->isTiled) + WriteTileImage(outputPath, options->numTilesMode, options->numTiles, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette); + else + WritePlainImage(outputPath, options->dataWidth, &image, !image.hasPalette); FreeImage(&image); } @@ -94,6 +103,8 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a options.metatileHeight = 1; options.tilemapFilePath = NULL; options.isAffineMap = false; + options.isTiled = true; + options.dataWidth = 1; for (int i = 3; i < argc; i++) { @@ -162,6 +173,22 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a { options.isAffineMap = true; } + else if (strcmp(option, "-plain") == 0) + { + options.isTiled = false; + } + else if (strcmp(option, "-data_width") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No data width value following \"-data_width\".\n"); + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.dataWidth)) + FATAL_ERROR("Failed to parse data width.\n"); + + if (options.dataWidth < 1) + FATAL_ERROR("Data width must be positive.\n"); + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); @@ -177,15 +204,16 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **argv) { char *outputFileExtension = GetFileExtensionAfterDot(outputPath); - int bitDepth = outputFileExtension[0] - '0'; struct PngToGbaOptions options; options.numTilesMode = NUM_TILES_IGNORE; options.numTiles = 0; - options.bitDepth = bitDepth; + options.bitDepth = outputFileExtension[0] - '0'; options.metatileWidth = 1; options.metatileHeight = 1; options.tilemapFilePath = NULL; options.isAffineMap = false; + options.isTiled = true; + options.dataWidth = 1; for (int i = 3; i < argc; i++) { @@ -236,6 +264,22 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a if (options.metatileHeight < 1) FATAL_ERROR("metatile height must be positive.\n"); } + else if (strcmp(option, "-plain") == 0) + { + options.isTiled = false; + } + else if (strcmp(option, "-data_width") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No data width value following \"-data_width\".\n"); + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.dataWidth)) + FATAL_ERROR("Failed to parse data width.\n"); + + if (options.dataWidth < 1) + FATAL_ERROR("Data width must be positive.\n"); + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); @@ -403,7 +447,7 @@ void HandleLZCompressCommand(char *inputPath, char *outputPath, int argc, char * else if (strcmp(option, "-search") == 0) { if (i + 1 >= argc) - FATAL_ERROR("No size following \"-overflow\".\n"); + FATAL_ERROR("No size following \"-search\".\n"); i++; diff --git a/tools/gbagfx/options.h b/tools/gbagfx/options.h index 250b72345..830158b52 100644 --- a/tools/gbagfx/options.h +++ b/tools/gbagfx/options.h @@ -15,6 +15,8 @@ struct GbaToPngOptions { int metatileHeight; char *tilemapFilePath; bool isAffineMap; + bool isTiled; + int dataWidth; }; struct PngToGbaOptions { @@ -25,6 +27,8 @@ struct PngToGbaOptions { int metatileHeight; char *tilemapFilePath; bool isAffineMap; + bool isTiled; + int dataWidth; }; #endif // OPTIONS_H