Add trainer battle sprites & update gfx.asm

This commit is contained in:
ehw 2018-06-01 22:18:11 -04:00 committed by GitHub
parent a390b01561
commit 8122f9a8d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 43 additions and 0 deletions

43
gfx.asm
View File

@ -145,6 +145,48 @@ INCBIN "gfx/pokedex/cursors.2bpp"
PokedexSearchGFX::
INCBIN "gfx/pokedex/search.2bpp"
SECTION "Trainer Battle Sprites", ROMX[$4000], BANK[$12]
HayatoPic:: INCBIN "gfx/trainer/hayato.pic"
AkanePic:: INCBIN "gfx/trainer/akane.pic" ; Gen 1 Bug Catcher
TsukushiPic:: INCBIN "gfx/trainer/tsukushi.pic"
EnokiPic:: INCBIN "gfx/trainer/enoki.pic"
OkeraPic:: INCBIN "gfx/trainer/okera.pic" ; Gen 1 Police Female
MikanPic:: INCBIN "gfx/trainer/mikan.pic"
BluePic:: INCBIN "gfx/trainer/blue.pic" ; Gen 1 Pokemaniac
GamaPic:: INCBIN "gfx/trainer/gama.pic" ; Gen 1 Super Nerd
RivalPic:: INCBIN "gfx/trainer/rival.pic"
OakPic:: INCBIN "gfx/trainer/oak.pic"
ProtagonistPic:: INCBIN "/gfx/trainer/protagonist.pic"
KurtPic:: INCBIN "/gfx/trainer/kurt.pic"
YoungsterPic:: INCBIN "gfx/trainer/youngster.pic"
SchoolboyPic:: INCBIN "gfx/trainer/schoolboy.pic"
FledglingPic:: INCBIN "gfx/trainer/fledgling.pic"
LassPic:: INCBIN "gfx/trainer/lass.pic"
ProfessionalMPic:: INCBIN "gfx/trainer/professional_m.pic"
ProfessionalFPic:: INCBIN "gfx/trainer/professional_f.pic"
BeautyPic:: INCBIN "gfx/trainer/beauty.pic"
PokemaniacPic:: INCBIN "gfx/trainer/pokemaniac.pic"
RocketMPic:: INCBIN "gfx/trainer/rocket_m.pic"
TeacherMPic:: INCBIN "gfx/trainer/teacher_m.pic"
TeacherFPic:: INCBIN "gfx/trainer/teacher_f.pic"
BugCatcherBoyPic:: INCBIN "gfx/trainer/bug_catcher_boy.pic"
FisherPic:: INCBIN "gfx/trainer/fisher.pic"
SwimmerMPic:: INCBIN "gfx/trainer/swimmer_m.pic"
SwimmerFPic:: INCBIN "gfx/trainer/swimmer_f.pic"
SuperNerdPic:: INCBIN "gfx/trainer/supernerd.pic"
EngineerPic:: INCBIN "gfx/trainer/engineer.pic"
GreenPic:: INCBIN "gfx/trainer/green.pic" ; Gen 1 Green
BikerPic:: INCBIN "gfx/trainer/biker.pic"
BurglarPic:: INCBIN "gfx/trainer/burglar.pic"
FirebreatherPic:: INCBIN "gfx/trainer/firebreather.pic"
JugglerPic:: INCBIN "gfx/trainer/juggler.pic"
BlackbeltPic:: INCBIN "gfx/trainer/blackbelt.pic"
SportsmanPic:: INCBIN "gfx/trainer/sportsman.pic"
MediumPic:: INCBIN "gfx/trainer/medium.pic"
KimonoGirlPic:: INCBIN "gfx/trainer/kimonogirl.pic"
TwinsPic:: INCBIN "gfx/trainer/twins.pic"
SECTION "Bank 13 Tilesets 0a", ROMX[$4000], BANK[$13]
Tileset_0a_GFX:
INCBIN "gfx/tilesets/tileset_0a.2bpp"
@ -166,6 +208,7 @@ INCLUDE "gfx/pokemon/pkmn_pic_banks.asm"
INCLUDE "gfx/pokemon/pkmn_pics.asm"
SECTION "Annon Pic Ptrs and Pics", ROMX[$4d6a], BANK[$1f]
INCLUDE "gfx/pokemon/annon_pic_ptrs.asm"
INCLUDE "gfx/pokemon/annon_pics.asm"

BIN
gfx/trainer/akane.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

BIN
gfx/trainer/beauty.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

BIN
gfx/trainer/biker.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 745 B

BIN
gfx/trainer/blackbelt.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 580 B

BIN
gfx/trainer/blue.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 489 B

BIN
gfx/trainer/burglar.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

BIN
gfx/trainer/engineer.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B

BIN
gfx/trainer/enoki.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 447 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 B

BIN
gfx/trainer/fisher.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 585 B

BIN
gfx/trainer/fledgling.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 342 B

BIN
gfx/trainer/gama.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 B

BIN
gfx/trainer/green.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 B

BIN
gfx/trainer/hayato.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 B

BIN
gfx/trainer/juggler.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 595 B

BIN
gfx/trainer/kimonogirl.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 531 B

BIN
gfx/trainer/kurt.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 472 B

BIN
gfx/trainer/lass.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 500 B

BIN
gfx/trainer/medium.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 665 B

BIN
gfx/trainer/mikan.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 550 B

BIN
gfx/trainer/oak.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

BIN
gfx/trainer/okera.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

BIN
gfx/trainer/pokemaniac.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 585 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 585 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 601 B

BIN
gfx/trainer/protagonist.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

BIN
gfx/trainer/rival.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 426 B

BIN
gfx/trainer/rocket_m.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

BIN
gfx/trainer/schoolboy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 451 B

BIN
gfx/trainer/soldier.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 583 B

BIN
gfx/trainer/sportsman.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 536 B

BIN
gfx/trainer/supernerd.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 383 B

BIN
gfx/trainer/swimmer_f.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

BIN
gfx/trainer/swimmer_m.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 446 B

BIN
gfx/trainer/teacher_f.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

BIN
gfx/trainer/teacher_m.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 454 B

BIN
gfx/trainer/tsukushi.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 532 B

BIN
gfx/trainer/twins.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 557 B

BIN
gfx/trainer/youngster.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 B