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 committed 2019-03-17 17:20:40 -05:00

2 parents c3feb9871f 4ae8a52473

commit e9a3cc6d51

3041 files changed

+6917 -6419

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

No files matched your search

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

Loaded 100 of 3041 files, more files were not shown because too many files have changed in this diff. Show more