Merge branch 'PokemonExpansion' into fix_pyroarF

Browse Source

# Conflicts:
#	graphics/pokemon/pyroar/backf.png

...

This commit is contained in:

Eduardo Quezada D'Ottone 2021-10-17 19:38:06 -03:00

parent 9986591b6f 0b7072e007

commit 3cdf736eb8

4848 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

graphics/pokemon/abomasnow/anim_front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

BIN

graphics/pokemon/abomasnow/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 823 B After Width:  |  Height:  |  Size: 834 B

BIN

graphics/pokemon/abomasnow/footprint.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 273 B After Width:  |  Height:  |  Size: 288 B

BIN

graphics/pokemon/abomasnow/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

BIN

graphics/pokemon/abomasnow/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 383 B After Width:  |  Height:  |  Size: 393 B

BIN

graphics/pokemon/abra/anim_front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 951 B After Width:  |  Height:  |  Size: 981 B

BIN

graphics/pokemon/abra/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 611 B After Width:  |  Height:  |  Size: 620 B

BIN

graphics/pokemon/abra/footprint.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 93 B After Width:  |  Height:  |  Size: 94 B

BIN

graphics/pokemon/abra/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 650 B After Width:  |  Height:  |  Size: 667 B

BIN

graphics/pokemon/abra/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 366 B After Width:  |  Height:  |  Size: 368 B

BIN

graphics/pokemon/absol/anim_front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.4 KiB

BIN

graphics/pokemon/absol/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 641 B After Width:  |  Height:  |  Size: 647 B

BIN

graphics/pokemon/absol/footprint.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 102 B After Width:  |  Height:  |  Size: 102 B

BIN

graphics/pokemon/absol/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 898 B After Width:  |  Height:  |  Size: 903 B

BIN

graphics/pokemon/absol/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 352 B After Width:  |  Height:  |  Size: 359 B

BIN

graphics/pokemon/accelgor/anim_front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 985 B After Width:  |  Height:  |  Size: 997 B

BIN

graphics/pokemon/accelgor/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 777 B After Width:  |  Height:  |  Size: 788 B

BIN

graphics/pokemon/accelgor/footprint.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 204 B After Width:  |  Height:  |  Size: 218 B

BIN

graphics/pokemon/accelgor/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 725 B After Width:  |  Height:  |  Size: 728 B

BIN

graphics/pokemon/accelgor/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 383 B After Width:  |  Height:  |  Size: 387 B

BIN

graphics/pokemon/aegislash/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 573 B After Width:  |  Height:  |  Size: 582 B

BIN

graphics/pokemon/aegislash/blade/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 550 B After Width:  |  Height:  |  Size: 560 B

BIN

graphics/pokemon/aegislash/blade/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 911 B After Width:  |  Height:  |  Size: 914 B

BIN

graphics/pokemon/aegislash/blade/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 484 B After Width:  |  Height:  |  Size: 518 B

BIN

graphics/pokemon/aegislash/footprint.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 204 B After Width:  |  Height:  |  Size: 218 B

BIN

graphics/pokemon/aegislash/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 880 B After Width:  |  Height:  |  Size: 882 B

BIN

graphics/pokemon/aegislash/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 444 B After Width:  |  Height:  |  Size: 451 B

BIN

graphics/pokemon/aerodactyl/anim_front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

graphics/pokemon/aerodactyl/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 563 B After Width:  |  Height:  |  Size: 580 B

BIN

graphics/pokemon/aerodactyl/footprint.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 92 B After Width:  |  Height:  |  Size: 92 B

BIN

graphics/pokemon/aerodactyl/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 957 B After Width:  |  Height:  |  Size: 961 B

BIN

graphics/pokemon/aerodactyl/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 397 B After Width:  |  Height:  |  Size: 403 B

BIN

graphics/pokemon/aggron/anim_front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

BIN

graphics/pokemon/aggron/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 763 B After Width:  |  Height:  |  Size: 779 B

BIN

graphics/pokemon/aggron/footprint.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 102 B After Width:  |  Height:  |  Size: 102 B

BIN

graphics/pokemon/aggron/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

BIN

graphics/pokemon/aggron/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 444 B After Width:  |  Height:  |  Size: 450 B

BIN

graphics/pokemon/aipom/anim_front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

BIN

graphics/pokemon/aipom/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 742 B After Width:  |  Height:  |  Size: 754 B

BIN

graphics/pokemon/aipom/footprint.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 86 B After Width:  |  Height:  |  Size: 86 B

BIN

graphics/pokemon/aipom/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 654 B After Width:  |  Height:  |  Size: 661 B

BIN

graphics/pokemon/aipom/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 375 B After Width:  |  Height:  |  Size: 380 B

BIN

graphics/pokemon/alakazam/anim_front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

BIN

graphics/pokemon/alakazam/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 806 B After Width:  |  Height:  |  Size: 808 B

BIN

graphics/pokemon/alakazam/footprint.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 94 B After Width:  |  Height:  |  Size: 95 B

BIN

graphics/pokemon/alakazam/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 957 B After Width:  |  Height:  |  Size: 967 B

BIN

graphics/pokemon/alakazam/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 490 B After Width:  |  Height:  |  Size: 492 B

BIN

graphics/pokemon/alcremie/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 675 B After Width:  |  Height:  |  Size: 689 B

BIN

graphics/pokemon/alcremie/caramel_swirl/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 672 B After Width:  |  Height:  |  Size: 688 B

BIN

graphics/pokemon/alcremie/caramel_swirl/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 751 B After Width:  |  Height:  |  Size: 805 B

BIN

graphics/pokemon/alcremie/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 730 B After Width:  |  Height:  |  Size: 745 B

BIN

graphics/pokemon/alcremie/icon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 361 B After Width:  |  Height:  |  Size: 369 B

BIN

graphics/pokemon/alcremie/lemon_cream/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 672 B After Width:  |  Height:  |  Size: 688 B

BIN

graphics/pokemon/alcremie/lemon_cream/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 751 B After Width:  |  Height:  |  Size: 805 B

BIN

graphics/pokemon/alcremie/matcha_cream/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 700 B After Width:  |  Height:  |  Size: 747 B

BIN

graphics/pokemon/alcremie/matcha_cream/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 754 B After Width:  |  Height:  |  Size: 805 B

BIN

graphics/pokemon/alcremie/mint_cream/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 672 B After Width:  |  Height:  |  Size: 688 B

BIN

graphics/pokemon/alcremie/mint_cream/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 755 B After Width:  |  Height:  |  Size: 806 B

BIN

graphics/pokemon/alcremie/rainbow_swirl/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 719 B After Width:  |  Height:  |  Size: 755 B

BIN

graphics/pokemon/alcremie/rainbow_swirl/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 767 B After Width:  |  Height:  |  Size: 769 B

BIN

graphics/pokemon/alcremie/ruby_cream/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 686 B After Width:  |  Height:  |  Size: 693 B

BIN

graphics/pokemon/alcremie/ruby_cream/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 761 B After Width:  |  Height:  |  Size: 809 B

BIN

graphics/pokemon/alcremie/ruby_swirl/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 680 B After Width:  |  Height:  |  Size: 691 B

BIN

graphics/pokemon/alcremie/ruby_swirl/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 744 B After Width:  |  Height:  |  Size: 753 B

BIN

graphics/pokemon/alcremie/salted_cream/back.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 671 B After Width:  |  Height:  |  Size: 688 B

BIN

graphics/pokemon/alcremie/salted_cream/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 749 B After Width:  |  Height:  |  Size: 804 B

BIN

graphics/pokemon/alolan_diglett/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 380 B After Width:  |  Height:  |  Size: 398 B

BIN

graphics/pokemon/alolan_diglett/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 450 B After Width:  |  Height:  |  Size: 451 B

BIN

graphics/pokemon/alolan_diglett/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 321 B After Width:  |  Height:  |  Size: 358 B

BIN

graphics/pokemon/alolan_dugtrio/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 519 B After Width:  |  Height:  |  Size: 519 B

BIN

graphics/pokemon/alolan_dugtrio/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 776 B After Width:  |  Height:  |  Size: 776 B

BIN

graphics/pokemon/alolan_dugtrio/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 441 B After Width:  |  Height:  |  Size: 476 B

BIN

graphics/pokemon/alolan_exeggutor/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 837 B After Width:  |  Height:  |  Size: 848 B

BIN

graphics/pokemon/alolan_exeggutor/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 936 B After Width:  |  Height:  |  Size: 939 B

BIN

graphics/pokemon/alolan_exeggutor/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 502 B After Width:  |  Height:  |  Size: 536 B

BIN

graphics/pokemon/alolan_geodude/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 596 B After Width:  |  Height:  |  Size: 621 B

BIN

graphics/pokemon/alolan_geodude/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 534 B After Width:  |  Height:  |  Size: 551 B

BIN

graphics/pokemon/alolan_geodude/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 375 B After Width:  |  Height:  |  Size: 410 B

BIN

graphics/pokemon/alolan_golem/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 679 B After Width:  |  Height:  |  Size: 696 B

BIN

graphics/pokemon/alolan_golem/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 896 B After Width:  |  Height:  |  Size: 893 B

BIN

graphics/pokemon/alolan_golem/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 427 B After Width:  |  Height:  |  Size: 465 B

BIN

graphics/pokemon/alolan_graveler/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 735 B After Width:  |  Height:  |  Size: 751 B

BIN

graphics/pokemon/alolan_graveler/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 884 B After Width:  |  Height:  |  Size: 889 B

BIN

graphics/pokemon/alolan_graveler/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 485 B After Width:  |  Height:  |  Size: 519 B

BIN

graphics/pokemon/alolan_grimer/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 631 B After Width:  |  Height:  |  Size: 647 B

BIN

graphics/pokemon/alolan_grimer/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 680 B After Width:  |  Height:  |  Size: 686 B

BIN

graphics/pokemon/alolan_grimer/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 449 B After Width:  |  Height:  |  Size: 486 B

BIN

graphics/pokemon/alolan_marowak/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 776 B After Width:  |  Height:  |  Size: 777 B

BIN

graphics/pokemon/alolan_marowak/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 846 B After Width:  |  Height:  |  Size: 846 B

BIN

graphics/pokemon/alolan_marowak/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 459 B After Width:  |  Height:  |  Size: 495 B

BIN

graphics/pokemon/alolan_meowth/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 651 B After Width:  |  Height:  |  Size: 661 B

BIN

graphics/pokemon/alolan_meowth/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 647 B After Width:  |  Height:  |  Size: 660 B

BIN

graphics/pokemon/alolan_meowth/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 387 B After Width:  |  Height:  |  Size: 426 B

BIN

graphics/pokemon/alolan_muk/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 872 B After Width:  |  Height:  |  Size: 883 B

BIN

graphics/pokemon/alolan_muk/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 909 B After Width:  |  Height:  |  Size: 917 B

BIN

graphics/pokemon/alolan_muk/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 585 B After Width:  |  Height:  |  Size: 626 B

BIN

graphics/pokemon/alolan_ninetales/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 794 B After Width:  |  Height:  |  Size: 806 B

BIN

graphics/pokemon/alolan_ninetales/front.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1002 B After Width:  |  Height:  |  Size: 1012 B

BIN

graphics/pokemon/alolan_ninetales/icon.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 559 B After Width:  |  Height:  |  Size: 601 B

BIN

graphics/pokemon/alolan_persian/back.png Normal file → Executable file

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 675 B After Width:  |  Height:  |  Size: 679 B

Some files were not shown because too many files have changed in this diff Show More