diff --git a/extract_sprites.py b/extract_sprites.py index 86a2d7c3ea..32e21aaa52 100644 --- a/extract_sprites.py +++ b/extract_sprites.py @@ -57,7 +57,7 @@ def closest_color(c, palette): min_d = float('inf') best = 0 r1, g1, b1 = c - for i, (r2, g2, b2) in enumerate(palette): + for i, (r2, g2, b2) in enumerate(palette[1:], 1): # Color diff from https://stackoverflow.com/questions/1847092/given-an-rgb-value-what-would-be-the-best-way-to-find-the-closest-match-in-the-d d = ((r2-r1)*0.30)**2 + ((g2-g1)*0.59)**2 + ((b2-b1)*0.11)**2 if d < min_d: @@ -75,7 +75,7 @@ def apply_palette(palette_file, input_file, output_file): # Apply one file's pa with open(output_file, 'wb') as f: new_rows = [] for row in rows: - new_rows.append([closest_color(src_palette[c], target_palette) for c in row]) + new_rows.append([closest_color(src_palette[c], target_palette) if c else 0 for c in row]) w = png.Writer(width=w, height=h, bitdepth=4, palette=target_palette) w.write(f, new_rows) @@ -84,14 +84,14 @@ def paletteify(path, output_path=None): joinp = os.path.join _, tail = os.path.split(path) species, _ = os.path.splitext(tail) - front = png.Reader(joinp(PKMN_GRAPHICS, species.split('_')[0], species.split('_')[1], 'anim_front.png')) + front = png.Reader(joinp(PKMN_GRAPHICS, species, 'anim_front.png')) front.read() target_palette = tuple(c[:3] for c in front.palette()) r, g, b = target_palette[0] color = f'rgb({r},{g},{b})' # Strip alpha color subprocess.run(['convert', path, '-background', color, '-alpha', 'remove', output_path], check=True) - apply_palette(joinp(PKMN_GRAPHICS, species.split('_')[0], species.split('_')[1], 'anim_front.png'), output_path, output_path) + apply_palette(joinp(PKMN_GRAPHICS, species, 'anim_front.png'), output_path, output_path) # Sprites from https://veekun.com/dex/downloads @@ -100,4 +100,11 @@ if __name__ == '__main__': if args: paletteify(args[0]) else: - stack_sprite('201-question.png', 'overworld') + for path in sorted(glob('overworld/*.png')): + _, tail = os.path.split(path) + name, _ = os.path.splitext(tail) + output_path = os.path.join('graphics/object_events/pics/pokemon', f'{name}.png') + try: + paletteify(path, output_path) + except Exception as e: + print(name, e.__class__.__name__, e, file=sys.stderr) diff --git a/graphics/object_events/pics/pokemon/aipom.png b/graphics/object_events/pics/pokemon/aipom.png index 2cd8776ed4..51aeeaa5bd 100644 Binary files a/graphics/object_events/pics/pokemon/aipom.png and b/graphics/object_events/pics/pokemon/aipom.png differ diff --git a/graphics/object_events/pics/pokemon/alakazam.png b/graphics/object_events/pics/pokemon/alakazam.png index c4216a38ea..a11f2af5dd 100644 Binary files a/graphics/object_events/pics/pokemon/alakazam.png and b/graphics/object_events/pics/pokemon/alakazam.png differ diff --git a/graphics/object_events/pics/pokemon/ampharos.png b/graphics/object_events/pics/pokemon/ampharos.png index efc07213b3..076d853d03 100644 Binary files a/graphics/object_events/pics/pokemon/ampharos.png and b/graphics/object_events/pics/pokemon/ampharos.png differ diff --git a/graphics/object_events/pics/pokemon/anorith.png b/graphics/object_events/pics/pokemon/anorith.png index 4442109dd3..4588e2fe1f 100644 Binary files a/graphics/object_events/pics/pokemon/anorith.png and b/graphics/object_events/pics/pokemon/anorith.png differ diff --git a/graphics/object_events/pics/pokemon/arbok.png b/graphics/object_events/pics/pokemon/arbok.png index dfb456c0f9..9720407fb0 100644 Binary files a/graphics/object_events/pics/pokemon/arbok.png and b/graphics/object_events/pics/pokemon/arbok.png differ diff --git a/graphics/object_events/pics/pokemon/arcanine.png b/graphics/object_events/pics/pokemon/arcanine.png index 010af6bea3..b3263b06a4 100644 Binary files a/graphics/object_events/pics/pokemon/arcanine.png and b/graphics/object_events/pics/pokemon/arcanine.png differ diff --git a/graphics/object_events/pics/pokemon/articuno.png b/graphics/object_events/pics/pokemon/articuno.png index 3899abd57b..776024b046 100644 Binary files a/graphics/object_events/pics/pokemon/articuno.png and b/graphics/object_events/pics/pokemon/articuno.png differ diff --git a/graphics/object_events/pics/pokemon/banette.png b/graphics/object_events/pics/pokemon/banette.png index cc9c14d6d3..14223bf887 100644 Binary files a/graphics/object_events/pics/pokemon/banette.png and b/graphics/object_events/pics/pokemon/banette.png differ diff --git a/graphics/object_events/pics/pokemon/barboach.png b/graphics/object_events/pics/pokemon/barboach.png index 893b3ae364..af6e0f1f4b 100644 Binary files a/graphics/object_events/pics/pokemon/barboach.png and b/graphics/object_events/pics/pokemon/barboach.png differ diff --git a/graphics/object_events/pics/pokemon/bayleef.png b/graphics/object_events/pics/pokemon/bayleef.png index 95ef810c94..58545acd1b 100644 Binary files a/graphics/object_events/pics/pokemon/bayleef.png and b/graphics/object_events/pics/pokemon/bayleef.png differ diff --git a/graphics/object_events/pics/pokemon/beedrill.png b/graphics/object_events/pics/pokemon/beedrill.png index 6c1c26361d..7a163b6297 100644 Binary files a/graphics/object_events/pics/pokemon/beedrill.png and b/graphics/object_events/pics/pokemon/beedrill.png differ diff --git a/graphics/object_events/pics/pokemon/bellossom.png b/graphics/object_events/pics/pokemon/bellossom.png index 062218cf5a..70a83c2f4d 100644 Binary files a/graphics/object_events/pics/pokemon/bellossom.png and b/graphics/object_events/pics/pokemon/bellossom.png differ diff --git a/graphics/object_events/pics/pokemon/blastoise.png b/graphics/object_events/pics/pokemon/blastoise.png index 6faeb38dd1..b7b6ff7ecc 100644 Binary files a/graphics/object_events/pics/pokemon/blastoise.png and b/graphics/object_events/pics/pokemon/blastoise.png differ diff --git a/graphics/object_events/pics/pokemon/blissey.png b/graphics/object_events/pics/pokemon/blissey.png index 2a3643dc8d..573f40d3f0 100644 Binary files a/graphics/object_events/pics/pokemon/blissey.png and b/graphics/object_events/pics/pokemon/blissey.png differ diff --git a/graphics/object_events/pics/pokemon/breloom.png b/graphics/object_events/pics/pokemon/breloom.png index 18ca83cf57..cf8eb0c718 100644 Binary files a/graphics/object_events/pics/pokemon/breloom.png and b/graphics/object_events/pics/pokemon/breloom.png differ diff --git a/graphics/object_events/pics/pokemon/camerupt.png b/graphics/object_events/pics/pokemon/camerupt.png index 5d77d49c51..498075fe17 100644 Binary files a/graphics/object_events/pics/pokemon/camerupt.png and b/graphics/object_events/pics/pokemon/camerupt.png differ diff --git a/graphics/object_events/pics/pokemon/chansey.png b/graphics/object_events/pics/pokemon/chansey.png index 1532d1cca0..72b42352c6 100644 Binary files a/graphics/object_events/pics/pokemon/chansey.png and b/graphics/object_events/pics/pokemon/chansey.png differ diff --git a/graphics/object_events/pics/pokemon/charizard.png b/graphics/object_events/pics/pokemon/charizard.png index f9168dbb7e..3c8231b3ad 100644 Binary files a/graphics/object_events/pics/pokemon/charizard.png and b/graphics/object_events/pics/pokemon/charizard.png differ diff --git a/graphics/object_events/pics/pokemon/chikorita.png b/graphics/object_events/pics/pokemon/chikorita.png index 3cece834fc..f8aea68a39 100644 Binary files a/graphics/object_events/pics/pokemon/chikorita.png and b/graphics/object_events/pics/pokemon/chikorita.png differ diff --git a/graphics/object_events/pics/pokemon/chinchou.png b/graphics/object_events/pics/pokemon/chinchou.png index 0ff5b1e50d..703014eda6 100644 Binary files a/graphics/object_events/pics/pokemon/chinchou.png and b/graphics/object_events/pics/pokemon/chinchou.png differ diff --git a/graphics/object_events/pics/pokemon/claydol.png b/graphics/object_events/pics/pokemon/claydol.png index 9f9b8c0859..13bd51356f 100644 Binary files a/graphics/object_events/pics/pokemon/claydol.png and b/graphics/object_events/pics/pokemon/claydol.png differ diff --git a/graphics/object_events/pics/pokemon/clefairy.png b/graphics/object_events/pics/pokemon/clefairy.png index de4e5680ce..38bd950172 100644 Binary files a/graphics/object_events/pics/pokemon/clefairy.png and b/graphics/object_events/pics/pokemon/clefairy.png differ diff --git a/graphics/object_events/pics/pokemon/cloyster.png b/graphics/object_events/pics/pokemon/cloyster.png index f855f07278..d979526f72 100644 Binary files a/graphics/object_events/pics/pokemon/cloyster.png and b/graphics/object_events/pics/pokemon/cloyster.png differ diff --git a/graphics/object_events/pics/pokemon/corsola.png b/graphics/object_events/pics/pokemon/corsola.png index ca4a8aba26..4fb20bd464 100644 Binary files a/graphics/object_events/pics/pokemon/corsola.png and b/graphics/object_events/pics/pokemon/corsola.png differ diff --git a/graphics/object_events/pics/pokemon/croconaw.png b/graphics/object_events/pics/pokemon/croconaw.png index 15838c2992..c796ba8166 100644 Binary files a/graphics/object_events/pics/pokemon/croconaw.png and b/graphics/object_events/pics/pokemon/croconaw.png differ diff --git a/graphics/object_events/pics/pokemon/cyndaquil.png b/graphics/object_events/pics/pokemon/cyndaquil.png index dd9b2006af..4f3efcd7bb 100644 Binary files a/graphics/object_events/pics/pokemon/cyndaquil.png and b/graphics/object_events/pics/pokemon/cyndaquil.png differ diff --git a/graphics/object_events/pics/pokemon/diglett.png b/graphics/object_events/pics/pokemon/diglett.png index 149d1b8c9d..ee7fb302ae 100644 Binary files a/graphics/object_events/pics/pokemon/diglett.png and b/graphics/object_events/pics/pokemon/diglett.png differ diff --git a/graphics/object_events/pics/pokemon/dragonair.png b/graphics/object_events/pics/pokemon/dragonair.png index 89f0fa5bb7..e6bdb2b2c9 100644 Binary files a/graphics/object_events/pics/pokemon/dragonair.png and b/graphics/object_events/pics/pokemon/dragonair.png differ diff --git a/graphics/object_events/pics/pokemon/dragonite.png b/graphics/object_events/pics/pokemon/dragonite.png index 49b19f6f4a..9c8760a299 100644 Binary files a/graphics/object_events/pics/pokemon/dragonite.png and b/graphics/object_events/pics/pokemon/dragonite.png differ diff --git a/graphics/object_events/pics/pokemon/dratini.png b/graphics/object_events/pics/pokemon/dratini.png index 2715d80d40..68568b1aac 100644 Binary files a/graphics/object_events/pics/pokemon/dratini.png and b/graphics/object_events/pics/pokemon/dratini.png differ diff --git a/graphics/object_events/pics/pokemon/drowzee.png b/graphics/object_events/pics/pokemon/drowzee.png index 0629bb936b..d75e245a6f 100644 Binary files a/graphics/object_events/pics/pokemon/drowzee.png and b/graphics/object_events/pics/pokemon/drowzee.png differ diff --git a/graphics/object_events/pics/pokemon/dugtrio.png b/graphics/object_events/pics/pokemon/dugtrio.png index 4204b2aa69..d7b34bef7e 100644 Binary files a/graphics/object_events/pics/pokemon/dugtrio.png and b/graphics/object_events/pics/pokemon/dugtrio.png differ diff --git a/graphics/object_events/pics/pokemon/dusclops.png b/graphics/object_events/pics/pokemon/dusclops.png index 721d9523fb..ca92a233c2 100644 Binary files a/graphics/object_events/pics/pokemon/dusclops.png and b/graphics/object_events/pics/pokemon/dusclops.png differ diff --git a/graphics/object_events/pics/pokemon/dustox.png b/graphics/object_events/pics/pokemon/dustox.png index 9e66a5f819..8bb0992b30 100644 Binary files a/graphics/object_events/pics/pokemon/dustox.png and b/graphics/object_events/pics/pokemon/dustox.png differ diff --git a/graphics/object_events/pics/pokemon/electabuzz.png b/graphics/object_events/pics/pokemon/electabuzz.png index d1b04f2936..ab16746cd9 100644 Binary files a/graphics/object_events/pics/pokemon/electabuzz.png and b/graphics/object_events/pics/pokemon/electabuzz.png differ diff --git a/graphics/object_events/pics/pokemon/electrode.png b/graphics/object_events/pics/pokemon/electrode.png index 6ef9a1aed7..824ed91d2e 100644 Binary files a/graphics/object_events/pics/pokemon/electrode.png and b/graphics/object_events/pics/pokemon/electrode.png differ diff --git a/graphics/object_events/pics/pokemon/espeon.png b/graphics/object_events/pics/pokemon/espeon.png index 599e9b8f30..62f609aebe 100644 Binary files a/graphics/object_events/pics/pokemon/espeon.png and b/graphics/object_events/pics/pokemon/espeon.png differ diff --git a/graphics/object_events/pics/pokemon/farfetchd.png b/graphics/object_events/pics/pokemon/farfetchd.png new file mode 100644 index 0000000000..f07591e400 Binary files /dev/null and b/graphics/object_events/pics/pokemon/farfetchd.png differ diff --git a/graphics/object_events/pics/pokemon/feebas.png b/graphics/object_events/pics/pokemon/feebas.png index c52b701870..a844fa689e 100644 Binary files a/graphics/object_events/pics/pokemon/feebas.png and b/graphics/object_events/pics/pokemon/feebas.png differ diff --git a/graphics/object_events/pics/pokemon/feraligatr.png b/graphics/object_events/pics/pokemon/feraligatr.png index c4556981e3..1a9046b3c9 100644 Binary files a/graphics/object_events/pics/pokemon/feraligatr.png and b/graphics/object_events/pics/pokemon/feraligatr.png differ diff --git a/graphics/object_events/pics/pokemon/flareon.png b/graphics/object_events/pics/pokemon/flareon.png index 8a63a9d2a5..b7cac2ed23 100644 Binary files a/graphics/object_events/pics/pokemon/flareon.png and b/graphics/object_events/pics/pokemon/flareon.png differ diff --git a/graphics/object_events/pics/pokemon/flygon.png b/graphics/object_events/pics/pokemon/flygon.png index ae7bd77f07..8e560e24e4 100644 Binary files a/graphics/object_events/pics/pokemon/flygon.png and b/graphics/object_events/pics/pokemon/flygon.png differ diff --git a/graphics/object_events/pics/pokemon/forretress.png b/graphics/object_events/pics/pokemon/forretress.png index 896b8774a1..36d721de0d 100644 Binary files a/graphics/object_events/pics/pokemon/forretress.png and b/graphics/object_events/pics/pokemon/forretress.png differ diff --git a/graphics/object_events/pics/pokemon/furret.png b/graphics/object_events/pics/pokemon/furret.png index 8a700e08d4..2ac228ea1e 100644 Binary files a/graphics/object_events/pics/pokemon/furret.png and b/graphics/object_events/pics/pokemon/furret.png differ diff --git a/graphics/object_events/pics/pokemon/gengar.png b/graphics/object_events/pics/pokemon/gengar.png index ab544cd42a..4d7a211ba4 100644 Binary files a/graphics/object_events/pics/pokemon/gengar.png and b/graphics/object_events/pics/pokemon/gengar.png differ diff --git a/graphics/object_events/pics/pokemon/geodude.png b/graphics/object_events/pics/pokemon/geodude.png index 4c5ed1faf1..9eaf4303e1 100644 Binary files a/graphics/object_events/pics/pokemon/geodude.png and b/graphics/object_events/pics/pokemon/geodude.png differ diff --git a/graphics/object_events/pics/pokemon/gligar.png b/graphics/object_events/pics/pokemon/gligar.png index 59a9738c89..7d89d630ef 100644 Binary files a/graphics/object_events/pics/pokemon/gligar.png and b/graphics/object_events/pics/pokemon/gligar.png differ diff --git a/graphics/object_events/pics/pokemon/golbat.png b/graphics/object_events/pics/pokemon/golbat.png index c36a8a9744..30907c1c6a 100644 Binary files a/graphics/object_events/pics/pokemon/golbat.png and b/graphics/object_events/pics/pokemon/golbat.png differ diff --git a/graphics/object_events/pics/pokemon/golduck.png b/graphics/object_events/pics/pokemon/golduck.png index 82757bcf69..8710232a07 100644 Binary files a/graphics/object_events/pics/pokemon/golduck.png and b/graphics/object_events/pics/pokemon/golduck.png differ diff --git a/graphics/object_events/pics/pokemon/gorebyss.png b/graphics/object_events/pics/pokemon/gorebyss.png index 7c4257998f..1870f2abbe 100644 Binary files a/graphics/object_events/pics/pokemon/gorebyss.png and b/graphics/object_events/pics/pokemon/gorebyss.png differ diff --git a/graphics/object_events/pics/pokemon/granbull.png b/graphics/object_events/pics/pokemon/granbull.png index e59a187b84..2fdfb1e9d5 100644 Binary files a/graphics/object_events/pics/pokemon/granbull.png and b/graphics/object_events/pics/pokemon/granbull.png differ diff --git a/graphics/object_events/pics/pokemon/graveler.png b/graphics/object_events/pics/pokemon/graveler.png index e5faa1594a..6bc4cf6b00 100644 Binary files a/graphics/object_events/pics/pokemon/graveler.png and b/graphics/object_events/pics/pokemon/graveler.png differ diff --git a/graphics/object_events/pics/pokemon/grimer.png b/graphics/object_events/pics/pokemon/grimer.png index c29dcc683a..5b4523387d 100644 Binary files a/graphics/object_events/pics/pokemon/grimer.png and b/graphics/object_events/pics/pokemon/grimer.png differ diff --git a/graphics/object_events/pics/pokemon/growlithe.png b/graphics/object_events/pics/pokemon/growlithe.png index e0cb9cd5ae..9b86f60a20 100644 Binary files a/graphics/object_events/pics/pokemon/growlithe.png and b/graphics/object_events/pics/pokemon/growlithe.png differ diff --git a/graphics/object_events/pics/pokemon/grumpig.png b/graphics/object_events/pics/pokemon/grumpig.png index d7122f5a00..6d0f22e7c8 100644 Binary files a/graphics/object_events/pics/pokemon/grumpig.png and b/graphics/object_events/pics/pokemon/grumpig.png differ diff --git a/graphics/object_events/pics/pokemon/heracross.png b/graphics/object_events/pics/pokemon/heracross.png index 14f61aba51..ff29253ef8 100644 Binary files a/graphics/object_events/pics/pokemon/heracross.png and b/graphics/object_events/pics/pokemon/heracross.png differ diff --git a/graphics/object_events/pics/pokemon/hitmonchan.png b/graphics/object_events/pics/pokemon/hitmonchan.png index e135f38731..3e4ef93e1a 100644 Binary files a/graphics/object_events/pics/pokemon/hitmonchan.png and b/graphics/object_events/pics/pokemon/hitmonchan.png differ diff --git a/graphics/object_events/pics/pokemon/hitmonlee.png b/graphics/object_events/pics/pokemon/hitmonlee.png index 2e466c065f..6479c3641b 100644 Binary files a/graphics/object_events/pics/pokemon/hitmonlee.png and b/graphics/object_events/pics/pokemon/hitmonlee.png differ diff --git a/graphics/object_events/pics/pokemon/ho_oh.png b/graphics/object_events/pics/pokemon/ho_oh.png index 909c3475dc..d316b71d4d 100644 Binary files a/graphics/object_events/pics/pokemon/ho_oh.png and b/graphics/object_events/pics/pokemon/ho_oh.png differ diff --git a/graphics/object_events/pics/pokemon/hoothoot.png b/graphics/object_events/pics/pokemon/hoothoot.png index 94986bc82f..1c6eedaac8 100644 Binary files a/graphics/object_events/pics/pokemon/hoothoot.png and b/graphics/object_events/pics/pokemon/hoothoot.png differ diff --git a/graphics/object_events/pics/pokemon/horsea.png b/graphics/object_events/pics/pokemon/horsea.png index 7cfc37fd7c..52d792eeb6 100644 Binary files a/graphics/object_events/pics/pokemon/horsea.png and b/graphics/object_events/pics/pokemon/horsea.png differ diff --git a/graphics/object_events/pics/pokemon/houndoom.png b/graphics/object_events/pics/pokemon/houndoom.png index fd0bd7f5bc..869da31981 100644 Binary files a/graphics/object_events/pics/pokemon/houndoom.png and b/graphics/object_events/pics/pokemon/houndoom.png differ diff --git a/graphics/object_events/pics/pokemon/houndour.png b/graphics/object_events/pics/pokemon/houndour.png index 4397d968ec..daacf9b565 100644 Binary files a/graphics/object_events/pics/pokemon/houndour.png and b/graphics/object_events/pics/pokemon/houndour.png differ diff --git a/graphics/object_events/pics/pokemon/ivysaur.png b/graphics/object_events/pics/pokemon/ivysaur.png index 99a084e7c6..763ca7380c 100644 Binary files a/graphics/object_events/pics/pokemon/ivysaur.png and b/graphics/object_events/pics/pokemon/ivysaur.png differ diff --git a/graphics/object_events/pics/pokemon/jirachi.png b/graphics/object_events/pics/pokemon/jirachi.png index 700b0287ec..49932d092f 100644 Binary files a/graphics/object_events/pics/pokemon/jirachi.png and b/graphics/object_events/pics/pokemon/jirachi.png differ diff --git a/graphics/object_events/pics/pokemon/kadabra.png b/graphics/object_events/pics/pokemon/kadabra.png index ebe56d8299..8081953aed 100644 Binary files a/graphics/object_events/pics/pokemon/kadabra.png and b/graphics/object_events/pics/pokemon/kadabra.png differ diff --git a/graphics/object_events/pics/pokemon/kakuna.png b/graphics/object_events/pics/pokemon/kakuna.png index 371cf74ab6..ff3da1eb7d 100644 Binary files a/graphics/object_events/pics/pokemon/kakuna.png and b/graphics/object_events/pics/pokemon/kakuna.png differ diff --git a/graphics/object_events/pics/pokemon/kangaskhan.png b/graphics/object_events/pics/pokemon/kangaskhan.png index 62579ff85b..d9f08d071b 100644 Binary files a/graphics/object_events/pics/pokemon/kangaskhan.png and b/graphics/object_events/pics/pokemon/kangaskhan.png differ diff --git a/graphics/object_events/pics/pokemon/krabby.png b/graphics/object_events/pics/pokemon/krabby.png index c5dffa0392..7a1ddce18a 100644 Binary files a/graphics/object_events/pics/pokemon/krabby.png and b/graphics/object_events/pics/pokemon/krabby.png differ diff --git a/graphics/object_events/pics/pokemon/ledian.png b/graphics/object_events/pics/pokemon/ledian.png index 3cb51c5b29..0ab9506544 100644 Binary files a/graphics/object_events/pics/pokemon/ledian.png and b/graphics/object_events/pics/pokemon/ledian.png differ diff --git a/graphics/object_events/pics/pokemon/machamp.png b/graphics/object_events/pics/pokemon/machamp.png index 63ece51127..4b7a1188f9 100644 Binary files a/graphics/object_events/pics/pokemon/machamp.png and b/graphics/object_events/pics/pokemon/machamp.png differ diff --git a/graphics/object_events/pics/pokemon/machoke.png b/graphics/object_events/pics/pokemon/machoke.png index c62d5a3f27..5a80d45e88 100644 Binary files a/graphics/object_events/pics/pokemon/machoke.png and b/graphics/object_events/pics/pokemon/machoke.png differ diff --git a/graphics/object_events/pics/pokemon/machop.png b/graphics/object_events/pics/pokemon/machop.png index 482df39fa2..fdcc4f2be8 100644 Binary files a/graphics/object_events/pics/pokemon/machop.png and b/graphics/object_events/pics/pokemon/machop.png differ diff --git a/graphics/object_events/pics/pokemon/magmar.png b/graphics/object_events/pics/pokemon/magmar.png index 5fc8fbcfef..aeb27cc442 100644 Binary files a/graphics/object_events/pics/pokemon/magmar.png and b/graphics/object_events/pics/pokemon/magmar.png differ diff --git a/graphics/object_events/pics/pokemon/mankey.png b/graphics/object_events/pics/pokemon/mankey.png index 55c03b800c..5175272811 100644 Binary files a/graphics/object_events/pics/pokemon/mankey.png and b/graphics/object_events/pics/pokemon/mankey.png differ diff --git a/graphics/object_events/pics/pokemon/mawile.png b/graphics/object_events/pics/pokemon/mawile.png index 572d9b3846..43ad3b9f34 100644 Binary files a/graphics/object_events/pics/pokemon/mawile.png and b/graphics/object_events/pics/pokemon/mawile.png differ diff --git a/graphics/object_events/pics/pokemon/meditite.png b/graphics/object_events/pics/pokemon/meditite.png index b6a4eceb7d..aa778ce48e 100644 Binary files a/graphics/object_events/pics/pokemon/meditite.png and b/graphics/object_events/pics/pokemon/meditite.png differ diff --git a/graphics/object_events/pics/pokemon/meganium.png b/graphics/object_events/pics/pokemon/meganium.png index 062fd8d643..bfbf6190ff 100644 Binary files a/graphics/object_events/pics/pokemon/meganium.png and b/graphics/object_events/pics/pokemon/meganium.png differ diff --git a/graphics/object_events/pics/pokemon/metapod.png b/graphics/object_events/pics/pokemon/metapod.png index faf8dc6d61..100b676ca0 100644 Binary files a/graphics/object_events/pics/pokemon/metapod.png and b/graphics/object_events/pics/pokemon/metapod.png differ diff --git a/graphics/object_events/pics/pokemon/mew.png b/graphics/object_events/pics/pokemon/mew.png index 3af839ae88..ab8b8c43ff 100644 Binary files a/graphics/object_events/pics/pokemon/mew.png and b/graphics/object_events/pics/pokemon/mew.png differ diff --git a/graphics/object_events/pics/pokemon/mewtwo.png b/graphics/object_events/pics/pokemon/mewtwo.png index b77a293920..0f955fc734 100644 Binary files a/graphics/object_events/pics/pokemon/mewtwo.png and b/graphics/object_events/pics/pokemon/mewtwo.png differ diff --git a/graphics/object_events/pics/pokemon/misdreavus.png b/graphics/object_events/pics/pokemon/misdreavus.png index 3b3e61f1de..e4445fbfbb 100644 Binary files a/graphics/object_events/pics/pokemon/misdreavus.png and b/graphics/object_events/pics/pokemon/misdreavus.png differ diff --git a/graphics/object_events/pics/pokemon/mr_mime.png b/graphics/object_events/pics/pokemon/mr_mime.png new file mode 100644 index 0000000000..c4608e153b Binary files /dev/null and b/graphics/object_events/pics/pokemon/mr_mime.png differ diff --git a/graphics/object_events/pics/pokemon/muk.png b/graphics/object_events/pics/pokemon/muk.png index 061dc5b26b..84ab63aa83 100644 Binary files a/graphics/object_events/pics/pokemon/muk.png and b/graphics/object_events/pics/pokemon/muk.png differ diff --git a/graphics/object_events/pics/pokemon/murkrow.png b/graphics/object_events/pics/pokemon/murkrow.png index f85a05877f..62063434a2 100644 Binary files a/graphics/object_events/pics/pokemon/murkrow.png and b/graphics/object_events/pics/pokemon/murkrow.png differ diff --git a/graphics/object_events/pics/pokemon/nidoran_f.png b/graphics/object_events/pics/pokemon/nidoran_f.png index ed77773cef..f2ba710f57 100644 Binary files a/graphics/object_events/pics/pokemon/nidoran_f.png and b/graphics/object_events/pics/pokemon/nidoran_f.png differ diff --git a/graphics/object_events/pics/pokemon/nincada.png b/graphics/object_events/pics/pokemon/nincada.png index e14b9d9652..8797cb94dd 100644 Binary files a/graphics/object_events/pics/pokemon/nincada.png and b/graphics/object_events/pics/pokemon/nincada.png differ diff --git a/graphics/object_events/pics/pokemon/ninetales.png b/graphics/object_events/pics/pokemon/ninetales.png index 84911dba0a..7f32bc6452 100644 Binary files a/graphics/object_events/pics/pokemon/ninetales.png and b/graphics/object_events/pics/pokemon/ninetales.png differ diff --git a/graphics/object_events/pics/pokemon/noctowl.png b/graphics/object_events/pics/pokemon/noctowl.png index 1e7fed8260..c0c07391d5 100644 Binary files a/graphics/object_events/pics/pokemon/noctowl.png and b/graphics/object_events/pics/pokemon/noctowl.png differ diff --git a/graphics/object_events/pics/pokemon/omastar.png b/graphics/object_events/pics/pokemon/omastar.png index 113ee9ed7b..4087c809ff 100644 Binary files a/graphics/object_events/pics/pokemon/omastar.png and b/graphics/object_events/pics/pokemon/omastar.png differ diff --git a/graphics/object_events/pics/pokemon/phanpy.png b/graphics/object_events/pics/pokemon/phanpy.png index e0f569d2d4..db5c52d6e2 100644 Binary files a/graphics/object_events/pics/pokemon/phanpy.png and b/graphics/object_events/pics/pokemon/phanpy.png differ diff --git a/graphics/object_events/pics/pokemon/pidgeot.png b/graphics/object_events/pics/pokemon/pidgeot.png index 9b1dddce0c..7a6c0b37f4 100644 Binary files a/graphics/object_events/pics/pokemon/pidgeot.png and b/graphics/object_events/pics/pokemon/pidgeot.png differ diff --git a/graphics/object_events/pics/pokemon/pidgeotto.png b/graphics/object_events/pics/pokemon/pidgeotto.png index cc13676476..8b0d68eb07 100644 Binary files a/graphics/object_events/pics/pokemon/pidgeotto.png and b/graphics/object_events/pics/pokemon/pidgeotto.png differ diff --git a/graphics/object_events/pics/pokemon/pidgey.png b/graphics/object_events/pics/pokemon/pidgey.png index 446454c7b9..d298879168 100644 Binary files a/graphics/object_events/pics/pokemon/pidgey.png and b/graphics/object_events/pics/pokemon/pidgey.png differ diff --git a/graphics/object_events/pics/pokemon/pinsir.png b/graphics/object_events/pics/pokemon/pinsir.png index e61e85a80d..dd6d97a4b0 100644 Binary files a/graphics/object_events/pics/pokemon/pinsir.png and b/graphics/object_events/pics/pokemon/pinsir.png differ diff --git a/graphics/object_events/pics/pokemon/poliwag.png b/graphics/object_events/pics/pokemon/poliwag.png index 3dc57d2eb6..354ee262bc 100644 Binary files a/graphics/object_events/pics/pokemon/poliwag.png and b/graphics/object_events/pics/pokemon/poliwag.png differ diff --git a/graphics/object_events/pics/pokemon/poliwhirl.png b/graphics/object_events/pics/pokemon/poliwhirl.png index d77d84452a..76362bfc99 100644 Binary files a/graphics/object_events/pics/pokemon/poliwhirl.png and b/graphics/object_events/pics/pokemon/poliwhirl.png differ diff --git a/graphics/object_events/pics/pokemon/poliwrath.png b/graphics/object_events/pics/pokemon/poliwrath.png index 48da2a3a16..904160827d 100644 Binary files a/graphics/object_events/pics/pokemon/poliwrath.png and b/graphics/object_events/pics/pokemon/poliwrath.png differ diff --git a/graphics/object_events/pics/pokemon/ponyta.png b/graphics/object_events/pics/pokemon/ponyta.png index 265157d07a..6a5fb1f75c 100644 Binary files a/graphics/object_events/pics/pokemon/ponyta.png and b/graphics/object_events/pics/pokemon/ponyta.png differ diff --git a/graphics/object_events/pics/pokemon/porygon2.png b/graphics/object_events/pics/pokemon/porygon2.png index 3860d95fc0..77383576b8 100644 Binary files a/graphics/object_events/pics/pokemon/porygon2.png and b/graphics/object_events/pics/pokemon/porygon2.png differ diff --git a/graphics/object_events/pics/pokemon/primeape.png b/graphics/object_events/pics/pokemon/primeape.png index 25c8ed78ed..0ec19a2a05 100644 Binary files a/graphics/object_events/pics/pokemon/primeape.png and b/graphics/object_events/pics/pokemon/primeape.png differ diff --git a/graphics/object_events/pics/pokemon/psyduck.png b/graphics/object_events/pics/pokemon/psyduck.png index b7e7ed8ce4..240547b885 100644 Binary files a/graphics/object_events/pics/pokemon/psyduck.png and b/graphics/object_events/pics/pokemon/psyduck.png differ diff --git a/graphics/object_events/pics/pokemon/qwilfish.png b/graphics/object_events/pics/pokemon/qwilfish.png index d7695a5e54..277b6e1213 100644 Binary files a/graphics/object_events/pics/pokemon/qwilfish.png and b/graphics/object_events/pics/pokemon/qwilfish.png differ diff --git a/graphics/object_events/pics/pokemon/raichu.png b/graphics/object_events/pics/pokemon/raichu.png index 7de42d5bf8..b43769e1fc 100644 Binary files a/graphics/object_events/pics/pokemon/raichu.png and b/graphics/object_events/pics/pokemon/raichu.png differ diff --git a/graphics/object_events/pics/pokemon/raikou.png b/graphics/object_events/pics/pokemon/raikou.png index f92b69b416..22315887b5 100644 Binary files a/graphics/object_events/pics/pokemon/raikou.png and b/graphics/object_events/pics/pokemon/raikou.png differ diff --git a/graphics/object_events/pics/pokemon/raticate.png b/graphics/object_events/pics/pokemon/raticate.png index 55d8341cb0..a74e896ca6 100644 Binary files a/graphics/object_events/pics/pokemon/raticate.png and b/graphics/object_events/pics/pokemon/raticate.png differ diff --git a/graphics/object_events/pics/pokemon/rayquaza.png b/graphics/object_events/pics/pokemon/rayquaza.png index 1fca78a878..948804138d 100644 Binary files a/graphics/object_events/pics/pokemon/rayquaza.png and b/graphics/object_events/pics/pokemon/rayquaza.png differ diff --git a/graphics/object_events/pics/pokemon/regice.png b/graphics/object_events/pics/pokemon/regice.png index cccb25fe69..0cefcfc4f2 100644 Binary files a/graphics/object_events/pics/pokemon/regice.png and b/graphics/object_events/pics/pokemon/regice.png differ diff --git a/graphics/object_events/pics/pokemon/rhydon.png b/graphics/object_events/pics/pokemon/rhydon.png index 8626b394b8..1d7090dd93 100644 Binary files a/graphics/object_events/pics/pokemon/rhydon.png and b/graphics/object_events/pics/pokemon/rhydon.png differ diff --git a/graphics/object_events/pics/pokemon/roselia.png b/graphics/object_events/pics/pokemon/roselia.png index 5a2ff3d9e8..75bec86214 100644 Binary files a/graphics/object_events/pics/pokemon/roselia.png and b/graphics/object_events/pics/pokemon/roselia.png differ diff --git a/graphics/object_events/pics/pokemon/sandshrew.png b/graphics/object_events/pics/pokemon/sandshrew.png index 2241274b7f..ef3c30dc26 100644 Binary files a/graphics/object_events/pics/pokemon/sandshrew.png and b/graphics/object_events/pics/pokemon/sandshrew.png differ diff --git a/graphics/object_events/pics/pokemon/sandslash.png b/graphics/object_events/pics/pokemon/sandslash.png index 4b8eb2776b..f1662257ce 100644 Binary files a/graphics/object_events/pics/pokemon/sandslash.png and b/graphics/object_events/pics/pokemon/sandslash.png differ diff --git a/graphics/object_events/pics/pokemon/seadra.png b/graphics/object_events/pics/pokemon/seadra.png index 56532feef0..67f566540a 100644 Binary files a/graphics/object_events/pics/pokemon/seadra.png and b/graphics/object_events/pics/pokemon/seadra.png differ diff --git a/graphics/object_events/pics/pokemon/seaking.png b/graphics/object_events/pics/pokemon/seaking.png index 27a45b6b4c..bb97b08d71 100644 Binary files a/graphics/object_events/pics/pokemon/seaking.png and b/graphics/object_events/pics/pokemon/seaking.png differ diff --git a/graphics/object_events/pics/pokemon/sentret.png b/graphics/object_events/pics/pokemon/sentret.png index bc763cf77e..ec695ed2ba 100644 Binary files a/graphics/object_events/pics/pokemon/sentret.png and b/graphics/object_events/pics/pokemon/sentret.png differ diff --git a/graphics/object_events/pics/pokemon/shroomish.png b/graphics/object_events/pics/pokemon/shroomish.png index 95e18527b6..de258414e7 100644 Binary files a/graphics/object_events/pics/pokemon/shroomish.png and b/graphics/object_events/pics/pokemon/shroomish.png differ diff --git a/graphics/object_events/pics/pokemon/skiploom.png b/graphics/object_events/pics/pokemon/skiploom.png index 95bed007c4..da5baf252b 100644 Binary files a/graphics/object_events/pics/pokemon/skiploom.png and b/graphics/object_events/pics/pokemon/skiploom.png differ diff --git a/graphics/object_events/pics/pokemon/slakoth.png b/graphics/object_events/pics/pokemon/slakoth.png index 41694f6967..10f7b0c162 100644 Binary files a/graphics/object_events/pics/pokemon/slakoth.png and b/graphics/object_events/pics/pokemon/slakoth.png differ diff --git a/graphics/object_events/pics/pokemon/slowking.png b/graphics/object_events/pics/pokemon/slowking.png index 5e9c083f59..fe05626844 100644 Binary files a/graphics/object_events/pics/pokemon/slowking.png and b/graphics/object_events/pics/pokemon/slowking.png differ diff --git a/graphics/object_events/pics/pokemon/slowpoke.png b/graphics/object_events/pics/pokemon/slowpoke.png index 425b6b83a3..b7ffb9f472 100644 Binary files a/graphics/object_events/pics/pokemon/slowpoke.png and b/graphics/object_events/pics/pokemon/slowpoke.png differ diff --git a/graphics/object_events/pics/pokemon/snorlax.png b/graphics/object_events/pics/pokemon/snorlax.png index 9a0a6f2e7d..aacd9041ea 100644 Binary files a/graphics/object_events/pics/pokemon/snorlax.png and b/graphics/object_events/pics/pokemon/snorlax.png differ diff --git a/graphics/object_events/pics/pokemon/snorunt.png b/graphics/object_events/pics/pokemon/snorunt.png index de0938c209..34249e1613 100644 Binary files a/graphics/object_events/pics/pokemon/snorunt.png and b/graphics/object_events/pics/pokemon/snorunt.png differ diff --git a/graphics/object_events/pics/pokemon/snubbull.png b/graphics/object_events/pics/pokemon/snubbull.png index 96459a3335..596a4c43c2 100644 Binary files a/graphics/object_events/pics/pokemon/snubbull.png and b/graphics/object_events/pics/pokemon/snubbull.png differ diff --git a/graphics/object_events/pics/pokemon/spinarak.png b/graphics/object_events/pics/pokemon/spinarak.png index 9003042d70..0f78256a48 100644 Binary files a/graphics/object_events/pics/pokemon/spinarak.png and b/graphics/object_events/pics/pokemon/spinarak.png differ diff --git a/graphics/object_events/pics/pokemon/squirtle.png b/graphics/object_events/pics/pokemon/squirtle.png index aaa099cce9..d5567b02c1 100644 Binary files a/graphics/object_events/pics/pokemon/squirtle.png and b/graphics/object_events/pics/pokemon/squirtle.png differ diff --git a/graphics/object_events/pics/pokemon/suicune.png b/graphics/object_events/pics/pokemon/suicune.png index fdbcfd51e4..aee3d646d8 100644 Binary files a/graphics/object_events/pics/pokemon/suicune.png and b/graphics/object_events/pics/pokemon/suicune.png differ diff --git a/graphics/object_events/pics/pokemon/surskit.png b/graphics/object_events/pics/pokemon/surskit.png index 75cbeae75e..b29ec87572 100644 Binary files a/graphics/object_events/pics/pokemon/surskit.png and b/graphics/object_events/pics/pokemon/surskit.png differ diff --git a/graphics/object_events/pics/pokemon/tangela.png b/graphics/object_events/pics/pokemon/tangela.png index 84e7bdf8e9..3556657896 100644 Binary files a/graphics/object_events/pics/pokemon/tangela.png and b/graphics/object_events/pics/pokemon/tangela.png differ diff --git a/graphics/object_events/pics/pokemon/teddiursa.png b/graphics/object_events/pics/pokemon/teddiursa.png index 96f2054939..00ed843b97 100644 Binary files a/graphics/object_events/pics/pokemon/teddiursa.png and b/graphics/object_events/pics/pokemon/teddiursa.png differ diff --git a/graphics/object_events/pics/pokemon/vaporeon.png b/graphics/object_events/pics/pokemon/vaporeon.png index f81b919af1..b1ac9aad42 100644 Binary files a/graphics/object_events/pics/pokemon/vaporeon.png and b/graphics/object_events/pics/pokemon/vaporeon.png differ diff --git a/graphics/object_events/pics/pokemon/venomoth.png b/graphics/object_events/pics/pokemon/venomoth.png index 7b3af52472..6748d9336a 100644 Binary files a/graphics/object_events/pics/pokemon/venomoth.png and b/graphics/object_events/pics/pokemon/venomoth.png differ diff --git a/graphics/object_events/pics/pokemon/venusaur.png b/graphics/object_events/pics/pokemon/venusaur.png index 3ec4004899..1c49947b2e 100644 Binary files a/graphics/object_events/pics/pokemon/venusaur.png and b/graphics/object_events/pics/pokemon/venusaur.png differ diff --git a/graphics/object_events/pics/pokemon/victreebel.png b/graphics/object_events/pics/pokemon/victreebel.png index 61c9732c2a..896710042c 100644 Binary files a/graphics/object_events/pics/pokemon/victreebel.png and b/graphics/object_events/pics/pokemon/victreebel.png differ diff --git a/graphics/object_events/pics/pokemon/voltorb.png b/graphics/object_events/pics/pokemon/voltorb.png index b2a50e14f0..9cf5e1993d 100644 Binary files a/graphics/object_events/pics/pokemon/voltorb.png and b/graphics/object_events/pics/pokemon/voltorb.png differ diff --git a/graphics/object_events/pics/pokemon/weedle.png b/graphics/object_events/pics/pokemon/weedle.png index 21f6bf13d5..c5e08ddf8e 100644 Binary files a/graphics/object_events/pics/pokemon/weedle.png and b/graphics/object_events/pics/pokemon/weedle.png differ diff --git a/graphics/object_events/pics/pokemon/weepinbell.png b/graphics/object_events/pics/pokemon/weepinbell.png index f42fa84290..3376f35dd2 100644 Binary files a/graphics/object_events/pics/pokemon/weepinbell.png and b/graphics/object_events/pics/pokemon/weepinbell.png differ diff --git a/graphics/object_events/pics/pokemon/whiscash.png b/graphics/object_events/pics/pokemon/whiscash.png index 80048e48f4..37c8d2e168 100644 Binary files a/graphics/object_events/pics/pokemon/whiscash.png and b/graphics/object_events/pics/pokemon/whiscash.png differ diff --git a/graphics/object_events/pics/pokemon/wigglytuff.png b/graphics/object_events/pics/pokemon/wigglytuff.png index db76d65448..b52a399df9 100644 Binary files a/graphics/object_events/pics/pokemon/wigglytuff.png and b/graphics/object_events/pics/pokemon/wigglytuff.png differ diff --git a/graphics/object_events/pics/pokemon/wingull.png b/graphics/object_events/pics/pokemon/wingull.png index aa942217cf..bef36dd115 100644 Binary files a/graphics/object_events/pics/pokemon/wingull.png and b/graphics/object_events/pics/pokemon/wingull.png differ diff --git a/graphics/object_events/pics/pokemon/yanma.png b/graphics/object_events/pics/pokemon/yanma.png index 806969b8f7..ec67acf012 100644 Binary files a/graphics/object_events/pics/pokemon/yanma.png and b/graphics/object_events/pics/pokemon/yanma.png differ diff --git a/graphics/object_events/pics/pokemon/zigzagoon.png b/graphics/object_events/pics/pokemon/zigzagoon.png index e18c0910a0..2d847ca802 100644 Binary files a/graphics/object_events/pics/pokemon/zigzagoon.png and b/graphics/object_events/pics/pokemon/zigzagoon.png differ diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index ffca91213c..5ed754386c 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -921,6 +921,9 @@ $(OBJEVENTGFXDIR)/pokemon/magnemite.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/pokemon/magneton.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 +$(OBJEVENTGFXDIR)/pokemon/farfetchd.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + $(OBJEVENTGFXDIR)/pokemon/doduo.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 @@ -1035,6 +1038,9 @@ $(OBJEVENTGFXDIR)/pokemon/staryu.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/pokemon/starmie.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 +$(OBJEVENTGFXDIR)/pokemon/mr_mime.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + $(OBJEVENTGFXDIR)/pokemon/scyther.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 08072275df..14db20a2b0 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -436,6 +436,7 @@ const u32 gObjectEventPic_Slowpoke[] = INCBIN_U32("graphics/object_events/pics/p const u32 gObjectEventPic_Slowbro[] = INCBIN_U32("graphics/object_events/pics/pokemon/slowbro.4bpp"); const u32 gObjectEventPic_Magnemite[] = INCBIN_U32("graphics/object_events/pics/pokemon/magnemite.4bpp"); const u32 gObjectEventPic_Magneton[] = INCBIN_U32("graphics/object_events/pics/pokemon/magneton.4bpp"); +const u32 gObjectEventPic_Farfetchd[] = INCBIN_U32("graphics/object_events/pics/pokemon/farfetchd.4bpp"); const u32 gObjectEventPic_Doduo[] = INCBIN_U32("graphics/object_events/pics/pokemon/doduo.4bpp"); const u32 gObjectEventPic_Dodrio[] = INCBIN_U32("graphics/object_events/pics/pokemon/dodrio.4bpp"); const u32 gObjectEventPic_Seel[] = INCBIN_U32("graphics/object_events/pics/pokemon/seel.4bpp"); @@ -474,6 +475,7 @@ const u32 gObjectEventPic_Goldeen[] = INCBIN_U32("graphics/object_events/pics/po const u32 gObjectEventPic_Seaking[] = INCBIN_U32("graphics/object_events/pics/pokemon/seaking.4bpp"); const u32 gObjectEventPic_Staryu[] = INCBIN_U32("graphics/object_events/pics/pokemon/staryu.4bpp"); const u32 gObjectEventPic_Starmie[] = INCBIN_U32("graphics/object_events/pics/pokemon/starmie.4bpp"); +const u32 gObjectEventPic_Mr_Mime[] = INCBIN_U32("graphics/object_events/pics/pokemon/mr_mime.4bpp"); const u32 gObjectEventPic_Scyther[] = INCBIN_U32("graphics/object_events/pics/pokemon/scyther.4bpp"); const u32 gObjectEventPic_Jynx[] = INCBIN_U32("graphics/object_events/pics/pokemon/jynx.4bpp"); const u32 gObjectEventPic_Electabuzz[] = INCBIN_U32("graphics/object_events/pics/pokemon/electabuzz.4bpp"); diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 54011c970d..faf958743a 100755 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -330,6 +330,7 @@ const struct ObjectEventGraphicsInfo gPokemonObjectGraphics[] = { [SPECIES_SLOWBRO] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Slowbro, gDummySpriteAffineAnimTable}, [SPECIES_MAGNEMITE] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Magnemite, gDummySpriteAffineAnimTable}, [SPECIES_MAGNETON] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Magneton, gDummySpriteAffineAnimTable}, + [SPECIES_FARFETCHD] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Farfetchd, gDummySpriteAffineAnimTable}, [SPECIES_DODUO] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Doduo, gDummySpriteAffineAnimTable}, [SPECIES_DODRIO] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Dodrio, gDummySpriteAffineAnimTable}, [SPECIES_SEEL] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Seel, gDummySpriteAffineAnimTable}, @@ -368,6 +369,7 @@ const struct ObjectEventGraphicsInfo gPokemonObjectGraphics[] = { [SPECIES_SEAKING] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Seaking, gDummySpriteAffineAnimTable}, [SPECIES_STARYU] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Staryu, gDummySpriteAffineAnimTable}, [SPECIES_STARMIE] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Starmie, gDummySpriteAffineAnimTable}, + [SPECIES_MR_MIME] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Mr_Mime, gDummySpriteAffineAnimTable}, [SPECIES_SCYTHER] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Scyther, gDummySpriteAffineAnimTable}, [SPECIES_JYNX] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Jynx, gDummySpriteAffineAnimTable}, [SPECIES_ELECTABUZZ] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Electabuzz, gDummySpriteAffineAnimTable}, diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 211e166993..5267e3189e 100755 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -2646,6 +2646,14 @@ const struct SpriteFrameImage gObjectEventPicTable_Magneton[] = { overworld_frame(gObjectEventPic_Magneton, 4, 4, 4), overworld_frame(gObjectEventPic_Magneton, 4, 4, 5), }; +const struct SpriteFrameImage gObjectEventPicTable_Farfetchd[] = { + overworld_frame(gObjectEventPic_Farfetchd, 4, 4, 0), + overworld_frame(gObjectEventPic_Farfetchd, 4, 4, 1), + overworld_frame(gObjectEventPic_Farfetchd, 4, 4, 2), + overworld_frame(gObjectEventPic_Farfetchd, 4, 4, 3), + overworld_frame(gObjectEventPic_Farfetchd, 4, 4, 4), + overworld_frame(gObjectEventPic_Farfetchd, 4, 4, 5), +}; const struct SpriteFrameImage gObjectEventPicTable_Doduo[] = { overworld_frame(gObjectEventPic_Doduo, 4, 4, 0), overworld_frame(gObjectEventPic_Doduo, 4, 4, 1), @@ -2950,6 +2958,14 @@ const struct SpriteFrameImage gObjectEventPicTable_Starmie[] = { overworld_frame(gObjectEventPic_Starmie, 4, 4, 4), overworld_frame(gObjectEventPic_Starmie, 4, 4, 5), }; +const struct SpriteFrameImage gObjectEventPicTable_Mr_Mime[] = { + overworld_frame(gObjectEventPic_Mr_Mime, 4, 4, 0), + overworld_frame(gObjectEventPic_Mr_Mime, 4, 4, 1), + overworld_frame(gObjectEventPic_Mr_Mime, 4, 4, 2), + overworld_frame(gObjectEventPic_Mr_Mime, 4, 4, 3), + overworld_frame(gObjectEventPic_Mr_Mime, 4, 4, 4), + overworld_frame(gObjectEventPic_Mr_Mime, 4, 4, 5), +}; const struct SpriteFrameImage gObjectEventPicTable_Scyther[] = { overworld_frame(gObjectEventPic_Scyther, 4, 4, 0), overworld_frame(gObjectEventPic_Scyther, 4, 4, 1),