Merge pull request #59 from garakmon/mon_sprites · 2812a2bd7a - Pokemon-Firered - Gitea: Git with a cup of tea

dionmoustos/Pokemon-Firered

Merge pull request #59 from garakmon/mon_sprites

Move Mon Graphics

This commit is contained in:

PikalaxALT

2019-06-01 12:32:58 -04:00

committed by

GitHub

parent 405a4352c3 e66ebaa1f5

commit 2812a2bd7a

2428 changed files with 2428 additions and 2437 deletions

									
										Makefile
									
		+1
		-1
	
												View File
												
				@@ -78,7 +78,7 @@ OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))

				all: rom

				rom: $(ROM)

				rom: tools $(ROM)

				tools:

					@$(MAKE) -C tools/gbagfx

data/graphics.s

+2408 -2408

View File

File diff suppressed because it is too large Load Diff

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

View File

Before

Width: | Height: | Size: 578 B

After

Width: | Height: | Size: 578 B

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

View File

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

View File

Before

Width: | Height: | Size: 575 B

After

Width: | Height: | Size: 575 B

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

View File

Before

Width: | Height: | Size: 327 B

After

Width: | Height: | Size: 327 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 673 B

After

Width: | Height: | Size: 673 B

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

View File

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

View File

Before

Width: | Height: | Size: 890 B

After

Width: | Height: | Size: 890 B

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

View File

Before

Width: | Height: | Size: 371 B

After

Width: | Height: | Size: 371 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 602 B

After

Width: | Height: | Size: 602 B

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

View File

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

View File

Before

Width: | Height: | Size: 917 B

After

Width: | Height: | Size: 917 B

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

View File

Before

Width: | Height: | Size: 369 B

After

Width: | Height: | Size: 369 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 860 B

After

Width: | Height: | Size: 860 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 367 B

After

Width: | Height: | Size: 367 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 592 B

After

Width: | Height: | Size: 592 B

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

View File

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

View File

Before

Width: | Height: | Size: 639 B

After

Width: | Height: | Size: 639 B

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

View File

Before

Width: | Height: | Size: 399 B

After

Width: | Height: | Size: 399 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 729 B

After

Width: | Height: | Size: 729 B

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

View File

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

View File

Before

Width: | Height: | Size: 1015 B

After

Width: | Height: | Size: 1015 B

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

View File

Before

Width: | Height: | Size: 401 B

After

Width: | Height: | Size: 401 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 685 B

After

Width: | Height: | Size: 685 B

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

View File

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

View File

Before

Width: | Height: | Size: 825 B

After

Width: | Height: | Size: 825 B

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

View File

Before

Width: | Height: | Size: 419 B

After

Width: | Height: | Size: 419 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 714 B

After

Width: | Height: | Size: 714 B

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

View File

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

View File

Before

Width: | Height: | Size: 721 B

After

Width: | Height: | Size: 721 B

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

View File

Before

Width: | Height: | Size: 430 B

After

Width: | Height: | Size: 430 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 445 B

After

Width: | Height: | Size: 445 B

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

View File

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

View File

Before

Width: | Height: | Size: 691 B

After

Width: | Height: | Size: 691 B

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

View File

Before

Width: | Height: | Size: 377 B

After

Width: | Height: | Size: 377 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 491 B

After

Width: | Height: | Size: 491 B

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

View File

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

View File

Before

Width: | Height: | Size: 899 B

After

Width: | Height: | Size: 899 B

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

View File

Before

Width: | Height: | Size: 373 B

After

Width: | Height: | Size: 373 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 790 B

After

Width: | Height: | Size: 790 B

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

View File

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

View File

Before

Width: | Height: | Size: 1.0 KiB

After

Width: | Height: | Size: 1.0 KiB

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

View File

Before

Width: | Height: | Size: 445 B

After

Width: | Height: | Size: 445 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 706 B

After

Width: | Height: | Size: 706 B

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

View File

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

View File

Before

Width: | Height: | Size: 850 B

After

Width: | Height: | Size: 850 B

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

View File

Before

Width: | Height: | Size: 430 B

After

Width: | Height: | Size: 430 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 898 B

After

Width: | Height: | Size: 898 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 383 B

After

Width: | Height: | Size: 383 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 437 B

After

Width: | Height: | Size: 437 B

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

View File

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

View File

Before

Width: | Height: | Size: 384 B

After

Width: | Height: | Size: 384 B

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

View File

Before

Width: | Height: | Size: 262 B

After

Width: | Height: | Size: 262 B

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

View File

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

View File

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

View File

Before

Width: | Height: | Size: 504 B

After

Width: | Height: | Size: 504 B

graphics/pokemon/footprints/articuno_footprint.png → graphics/pokemon/articuno/footprint.png

View File

Before

Width: | Height: | Size: 106 B

After

Width: | Height: | Size: 106 B

graphics/pokemon/front_pics/articuno_still_front_pic.png → graphics/pokemon/articuno/front.png

View File

Before

Width: | Height: | Size: 1.0 KiB

After

Width: | Height: | Size: 1.0 KiB

graphics/pokemon/icons/articuno_icon.png → graphics/pokemon/articuno/icon.png

View File

Before

Width: | Height: | Size: 384 B

After

Width: | Height: | Size: 384 B

graphics/pokemon/palettes/articuno_palette.pal → graphics/pokemon/articuno/normal.pal

View File

graphics/pokemon/palettes/articuno_shiny_palette.pal → graphics/pokemon/articuno/shiny.pal

View File

graphics/pokemon/back_pics/azumarill_back_pic.png → graphics/pokemon/azumarill/back.png

View File

Before

Width: | Height: | Size: 541 B

After

Width: | Height: | Size: 541 B

graphics/pokemon/footprints/azumarill_footprint.png → graphics/pokemon/azumarill/footprint.png

View File

Before

Width: | Height: | Size: 88 B

After

Width: | Height: | Size: 88 B

graphics/pokemon/front_pics/azumarill_still_front_pic.png → graphics/pokemon/azumarill/front.png

View File

Before

Width: | Height: | Size: 631 B

After

Width: | Height: | Size: 631 B

graphics/pokemon/icons/azumarill_icon.png → graphics/pokemon/azumarill/icon.png

View File

Before

Width: | Height: | Size: 445 B

After

Width: | Height: | Size: 445 B

graphics/pokemon/palettes/azumarill_palette.pal → graphics/pokemon/azumarill/normal.pal

View File

graphics/pokemon/palettes/azumarill_shiny_palette.pal → graphics/pokemon/azumarill/shiny.pal

View File

graphics/pokemon/back_pics/azurill_back_pic.png → graphics/pokemon/azurill/back.png

View File

Before

Width: | Height: | Size: 601 B

After

Width: | Height: | Size: 601 B

graphics/pokemon/footprints/azurill_footprint.png → graphics/pokemon/azurill/footprint.png

View File

Before

Width: | Height: | Size: 84 B

After

Width: | Height: | Size: 84 B