Merge remote-tracking branch 'upstream/master' into move-tutor

Browse Source

# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c

...

This commit is contained in:

Marcus Huderle

2019-03-17 17:20:40 -05:00

parent c3feb9871f 4ae8a52473

commit e9a3cc6d51

3041 changed files with 6917 additions and 6419 deletions

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

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

graphics/pokemon/anim_front_pics/abra_front_pic.png → graphics/pokemon/abra/anim_front.png

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

graphics/pokemon/back_pics/abra_back_pic.png → graphics/pokemon/abra/back.png

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

graphics/pokemon/footprints/abra_footprint.png → graphics/pokemon/abra/footprint.png

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

graphics/pokemon/front_pics/abra_still_front_pic.png → graphics/pokemon/abra/front.png

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

graphics/pokemon/icons/abra_icon.png → graphics/pokemon/abra/icon.png

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

graphics/pokemon/palettes/abra_palette.pal → graphics/pokemon/abra/normal.pal

graphics/pokemon/palettes/abra_shiny_palette.pal → graphics/pokemon/abra/shiny.pal

graphics/pokemon/anim_front_pics/absol_front_pic.png → graphics/pokemon/absol/anim_front.png

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

graphics/pokemon/back_pics/absol_back_pic.png → graphics/pokemon/absol/back.png

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

graphics/pokemon/footprints/absol_footprint.png → graphics/pokemon/absol/footprint.png

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

graphics/pokemon/front_pics/absol_still_front_pic.png → graphics/pokemon/absol/front.png

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

graphics/pokemon/icons/absol_icon.png → graphics/pokemon/absol/icon.png

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

graphics/pokemon/palettes/absol_palette.pal → graphics/pokemon/absol/normal.pal

graphics/pokemon/palettes/absol_shiny_palette.pal → graphics/pokemon/absol/shiny.pal

graphics/pokemon/anim_front_pics/aerodactyl_front_pic.png → graphics/pokemon/aerodactyl/anim_front.png

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

graphics/pokemon/back_pics/aerodactyl_back_pic.png → graphics/pokemon/aerodactyl/back.png

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

graphics/pokemon/footprints/aerodactyl_footprint.png → graphics/pokemon/aerodactyl/footprint.png

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

graphics/pokemon/front_pics/aerodactyl_still_front_pic.png → graphics/pokemon/aerodactyl/front.png

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

graphics/pokemon/icons/aerodactyl_icon.png → graphics/pokemon/aerodactyl/icon.png

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

graphics/pokemon/palettes/aerodactyl_palette.pal → graphics/pokemon/aerodactyl/normal.pal

graphics/pokemon/palettes/aerodactyl_shiny_palette.pal → graphics/pokemon/aerodactyl/shiny.pal

graphics/pokemon/anim_front_pics/aggron_front_pic.png → graphics/pokemon/aggron/anim_front.png

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

graphics/pokemon/back_pics/aggron_back_pic.png → graphics/pokemon/aggron/back.png

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

graphics/pokemon/footprints/aggron_footprint.png → graphics/pokemon/aggron/footprint.png

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

graphics/pokemon/front_pics/aggron_still_front_pic.png → graphics/pokemon/aggron/front.png

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

graphics/pokemon/icons/aggron_icon.png → graphics/pokemon/aggron/icon.png

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

graphics/pokemon/palettes/aggron_palette.pal → graphics/pokemon/aggron/normal.pal

graphics/pokemon/palettes/aggron_shiny_palette.pal → graphics/pokemon/aggron/shiny.pal

graphics/pokemon/anim_front_pics/aipom_front_pic.png → graphics/pokemon/aipom/anim_front.png

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

graphics/pokemon/back_pics/aipom_back_pic.png → graphics/pokemon/aipom/back.png

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

graphics/pokemon/footprints/aipom_footprint.png → graphics/pokemon/aipom/footprint.png

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

graphics/pokemon/front_pics/aipom_still_front_pic.png → graphics/pokemon/aipom/front.png

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

graphics/pokemon/icons/aipom_icon.png → graphics/pokemon/aipom/icon.png

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

graphics/pokemon/palettes/aipom_palette.pal → graphics/pokemon/aipom/normal.pal

graphics/pokemon/palettes/aipom_shiny_palette.pal → graphics/pokemon/aipom/shiny.pal

graphics/pokemon/anim_front_pics/alakazam_front_pic.png → graphics/pokemon/alakazam/anim_front.png

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

graphics/pokemon/back_pics/alakazam_back_pic.png → graphics/pokemon/alakazam/back.png

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

graphics/pokemon/footprints/alakazam_footprint.png → graphics/pokemon/alakazam/footprint.png

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

graphics/pokemon/front_pics/alakazam_still_front_pic.png → graphics/pokemon/alakazam/front.png

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

graphics/pokemon/icons/alakazam_icon.png → graphics/pokemon/alakazam/icon.png

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

graphics/pokemon/palettes/alakazam_palette.pal → graphics/pokemon/alakazam/normal.pal

graphics/pokemon/palettes/alakazam_shiny_palette.pal → graphics/pokemon/alakazam/shiny.pal

graphics/pokemon/anim_front_pics/altaria_front_pic.png → graphics/pokemon/altaria/anim_front.png

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

graphics/pokemon/back_pics/altaria_back_pic.png → graphics/pokemon/altaria/back.png

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

graphics/pokemon/footprints/altaria_footprint.png → graphics/pokemon/altaria/footprint.png

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

graphics/pokemon/front_pics/altaria_still_front_pic.png → graphics/pokemon/altaria/front.png

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

graphics/pokemon/icons/altaria_icon.png → graphics/pokemon/altaria/icon.png

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

graphics/pokemon/palettes/altaria_palette.pal → graphics/pokemon/altaria/normal.pal

graphics/pokemon/palettes/altaria_shiny_palette.pal → graphics/pokemon/altaria/shiny.pal

graphics/pokemon/anim_front_pics/ampharos_front_pic.png → graphics/pokemon/ampharos/anim_front.png

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

graphics/pokemon/back_pics/ampharos_back_pic.png → graphics/pokemon/ampharos/back.png

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

graphics/pokemon/footprints/ampharos_footprint.png → graphics/pokemon/ampharos/footprint.png

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

graphics/pokemon/front_pics/ampharos_still_front_pic.png → graphics/pokemon/ampharos/front.png

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

graphics/pokemon/icons/ampharos_icon.png → graphics/pokemon/ampharos/icon.png

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

graphics/pokemon/palettes/ampharos_palette.pal → graphics/pokemon/ampharos/normal.pal

graphics/pokemon/palettes/ampharos_shiny_palette.pal → graphics/pokemon/ampharos/shiny.pal

graphics/pokemon/anim_front_pics/anorith_front_pic.png → graphics/pokemon/anorith/anim_front.png

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

graphics/pokemon/back_pics/anorith_back_pic.png → graphics/pokemon/anorith/back.png

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

graphics/pokemon/footprints/anorith_footprint.png → graphics/pokemon/anorith/footprint.png

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

graphics/pokemon/front_pics/anorith_still_front_pic.png → graphics/pokemon/anorith/front.png

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

graphics/pokemon/icons/anorith_icon.png → graphics/pokemon/anorith/icon.png

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

graphics/pokemon/palettes/anorith_palette.pal → graphics/pokemon/anorith/normal.pal

graphics/pokemon/palettes/anorith_shiny_palette.pal → graphics/pokemon/anorith/shiny.pal

graphics/pokemon/anim_front_pics/arbok_front_pic.png → graphics/pokemon/arbok/anim_front.png

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

graphics/pokemon/back_pics/arbok_back_pic.png → graphics/pokemon/arbok/back.png

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

graphics/pokemon/footprints/arbok_footprint.png → graphics/pokemon/arbok/footprint.png

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

graphics/pokemon/front_pics/arbok_still_front_pic.png → graphics/pokemon/arbok/front.png

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

graphics/pokemon/icons/arbok_icon.png → graphics/pokemon/arbok/icon.png

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

graphics/pokemon/palettes/arbok_palette.pal → graphics/pokemon/arbok/normal.pal

graphics/pokemon/palettes/arbok_shiny_palette.pal → graphics/pokemon/arbok/shiny.pal

graphics/pokemon/anim_front_pics/arcanine_front_pic.png → graphics/pokemon/arcanine/anim_front.png

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

graphics/pokemon/back_pics/arcanine_back_pic.png → graphics/pokemon/arcanine/back.png

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

graphics/pokemon/footprints/arcanine_footprint.png → graphics/pokemon/arcanine/footprint.png

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

graphics/pokemon/front_pics/arcanine_still_front_pic.png → graphics/pokemon/arcanine/front.png

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

graphics/pokemon/icons/arcanine_icon.png → graphics/pokemon/arcanine/icon.png

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

graphics/pokemon/palettes/arcanine_palette.pal → graphics/pokemon/arcanine/normal.pal

graphics/pokemon/palettes/arcanine_shiny_palette.pal → graphics/pokemon/arcanine/shiny.pal

graphics/pokemon/anim_front_pics/ariados_front_pic.png → graphics/pokemon/ariados/anim_front.png

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

graphics/pokemon/back_pics/ariados_back_pic.png → graphics/pokemon/ariados/back.png

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

graphics/pokemon/footprints/ariados_footprint.png → graphics/pokemon/ariados/footprint.png

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

graphics/pokemon/front_pics/ariados_still_front_pic.png → graphics/pokemon/ariados/front.png

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

graphics/pokemon/icons/ariados_icon.png → graphics/pokemon/ariados/icon.png

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

graphics/pokemon/palettes/ariados_palette.pal → graphics/pokemon/ariados/normal.pal

graphics/pokemon/palettes/ariados_shiny_palette.pal → graphics/pokemon/ariados/shiny.pal

graphics/pokemon/anim_front_pics/armaldo_front_pic.png → graphics/pokemon/armaldo/anim_front.png

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

graphics/pokemon/back_pics/armaldo_back_pic.png → graphics/pokemon/armaldo/back.png

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

graphics/pokemon/footprints/armaldo_footprint.png → graphics/pokemon/armaldo/footprint.png

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

graphics/pokemon/front_pics/armaldo_still_front_pic.png → graphics/pokemon/armaldo/front.png

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

graphics/pokemon/icons/armaldo_icon.png → graphics/pokemon/armaldo/icon.png

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

graphics/pokemon/palettes/armaldo_palette.pal → graphics/pokemon/armaldo/normal.pal

graphics/pokemon/palettes/armaldo_shiny_palette.pal → graphics/pokemon/armaldo/shiny.pal

graphics/pokemon/anim_front_pics/aron_front_pic.png → graphics/pokemon/aron/anim_front.png

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

graphics/pokemon/back_pics/aron_back_pic.png → graphics/pokemon/aron/back.png

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

graphics/pokemon/footprints/aron_footprint.png → graphics/pokemon/aron/footprint.png

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

graphics/pokemon/front_pics/aron_still_front_pic.png → graphics/pokemon/aron/front.png

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

graphics/pokemon/icons/aron_icon.png → graphics/pokemon/aron/icon.png

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

graphics/pokemon/palettes/aron_palette.pal → graphics/pokemon/aron/normal.pal

graphics/pokemon/palettes/aron_shiny_palette.pal → graphics/pokemon/aron/shiny.pal

graphics/pokemon/anim_front_pics/articuno_front_pic.png → graphics/pokemon/articuno/anim_front.png

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

graphics/pokemon/back_pics/articuno_back_pic.png → graphics/pokemon/articuno/back.png

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

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