Merge pull request #1 from ehw/trainersprites

Add trainer battle sprites & update gfx.asm

41 files changed, 43 insertions, 0 deletions

diff --git a/gfx.asm b/gfx.asm
index 6baaf80..a011608 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -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"
diff --git a/gfx/trainer/akane.png b/gfx/trainer/akane.png
new file mode 100644
index 0000000..0d108f4
--- /dev/null
+++ b/gfx/trainer/akane.png
diff --git a/gfx/trainer/beauty.png b/gfx/trainer/beauty.png
new file mode 100644
index 0000000..eaa70e6
--- /dev/null
+++ b/gfx/trainer/beauty.png
diff --git a/gfx/trainer/biker.png b/gfx/trainer/biker.png
new file mode 100644
index 0000000..1c95eea
--- /dev/null
+++ b/gfx/trainer/biker.png
diff --git a/gfx/trainer/blackbelt.png b/gfx/trainer/blackbelt.png
new file mode 100644
index 0000000..205fa08
--- /dev/null
+++ b/gfx/trainer/blackbelt.png
diff --git a/gfx/trainer/blue.png b/gfx/trainer/blue.png
new file mode 100644
index 0000000..954bbc4
--- /dev/null
+++ b/gfx/trainer/blue.png
diff --git a/gfx/trainer/bug_catcher_boy.png b/gfx/trainer/bug_catcher_boy.png
new file mode 100644
index 0000000..36c80c7
--- /dev/null
+++ b/gfx/trainer/bug_catcher_boy.png
diff --git a/gfx/trainer/burglar.png b/gfx/trainer/burglar.png
new file mode 100644
index 0000000..9142e8d
--- /dev/null
+++ b/gfx/trainer/burglar.png
diff --git a/gfx/trainer/engineer.png b/gfx/trainer/engineer.png
new file mode 100644
index 0000000..1a1944e
--- /dev/null
+++ b/gfx/trainer/engineer.png
diff --git a/gfx/trainer/enoki.png b/gfx/trainer/enoki.png
new file mode 100644
index 0000000..77ba390
--- /dev/null
+++ b/gfx/trainer/enoki.png
diff --git a/gfx/trainer/firebreather.png b/gfx/trainer/firebreather.png
new file mode 100644
index 0000000..ac1148a
--- /dev/null
+++ b/gfx/trainer/firebreather.png
diff --git a/gfx/trainer/fisher.png b/gfx/trainer/fisher.png
new file mode 100644
index 0000000..c845d9d
--- /dev/null
+++ b/gfx/trainer/fisher.png
diff --git a/gfx/trainer/fledgling.png b/gfx/trainer/fledgling.png
new file mode 100644
index 0000000..52c58b2
--- /dev/null
+++ b/gfx/trainer/fledgling.png
diff --git a/gfx/trainer/gama.png b/gfx/trainer/gama.png
new file mode 100644
index 0000000..37ef663
--- /dev/null
+++ b/gfx/trainer/gama.png
diff --git a/gfx/trainer/green.png b/gfx/trainer/green.png
new file mode 100644
index 0000000..6b94fd2
--- /dev/null
+++ b/gfx/trainer/green.png
diff --git a/gfx/trainer/hayato.png b/gfx/trainer/hayato.png
new file mode 100644
index 0000000..2d93a75
--- /dev/null
+++ b/gfx/trainer/hayato.png
diff --git a/gfx/trainer/juggler.png b/gfx/trainer/juggler.png
new file mode 100644
index 0000000..4a4f8a0
--- /dev/null
+++ b/gfx/trainer/juggler.png
diff --git a/gfx/trainer/kimonogirl.png b/gfx/trainer/kimonogirl.png
new file mode 100644
index 0000000..184c226
--- /dev/null
+++ b/gfx/trainer/kimonogirl.png
diff --git a/gfx/trainer/kurt.png b/gfx/trainer/kurt.png
new file mode 100644
index 0000000..b881214
--- /dev/null
+++ b/gfx/trainer/kurt.png
diff --git a/gfx/trainer/lass.png b/gfx/trainer/lass.png
new file mode 100644
index 0000000..ef5781c
--- /dev/null
+++ b/gfx/trainer/lass.png
diff --git a/gfx/trainer/medium.png b/gfx/trainer/medium.png
new file mode 100644
index 0000000..49b29c7
--- /dev/null
+++ b/gfx/trainer/medium.png
diff --git a/gfx/trainer/mikan.png b/gfx/trainer/mikan.png
new file mode 100644
index 0000000..e8150cf
--- /dev/null
+++ b/gfx/trainer/mikan.png
diff --git a/gfx/trainer/oak.png b/gfx/trainer/oak.png
new file mode 100644
index 0000000..7c7452f
--- /dev/null
+++ b/gfx/trainer/oak.png
diff --git a/gfx/trainer/okera.png b/gfx/trainer/okera.png
new file mode 100644
index 0000000..48392bf
--- /dev/null
+++ b/gfx/trainer/okera.png
diff --git a/gfx/trainer/pokemaniac.png b/gfx/trainer/pokemaniac.png
new file mode 100644
index 0000000..e0d7957
--- /dev/null
+++ b/gfx/trainer/pokemaniac.png
diff --git a/gfx/trainer/professional_f.png b/gfx/trainer/professional_f.png
new file mode 100644
index 0000000..3075251
--- /dev/null
+++ b/gfx/trainer/professional_f.png
diff --git a/gfx/trainer/professional_m.png b/gfx/trainer/professional_m.png
new file mode 100644
index 0000000..610dad5
--- /dev/null
+++ b/gfx/trainer/professional_m.png
diff --git a/gfx/trainer/protagonist.png b/gfx/trainer/protagonist.png
new file mode 100644
index 0000000..5215e15
--- /dev/null
+++ b/gfx/trainer/protagonist.png
diff --git a/gfx/trainer/rival.png b/gfx/trainer/rival.png
new file mode 100644
index 0000000..9514cb9
--- /dev/null
+++ b/gfx/trainer/rival.png
diff --git a/gfx/trainer/rocket_m.png b/gfx/trainer/rocket_m.png
new file mode 100644
index 0000000..257ad50
--- /dev/null
+++ b/gfx/trainer/rocket_m.png
diff --git a/gfx/trainer/schoolboy.png b/gfx/trainer/schoolboy.png
new file mode 100644
index 0000000..ab8b8d4
--- /dev/null
+++ b/gfx/trainer/schoolboy.png
diff --git a/gfx/trainer/soldier.png b/gfx/trainer/soldier.png
new file mode 100644
index 0000000..3dd9d4f
--- /dev/null
+++ b/gfx/trainer/soldier.png
diff --git a/gfx/trainer/sportsman.png b/gfx/trainer/sportsman.png
new file mode 100644
index 0000000..0d1f02d
--- /dev/null
+++ b/gfx/trainer/sportsman.png
diff --git a/gfx/trainer/supernerd.png b/gfx/trainer/supernerd.png
new file mode 100644
index 0000000..5034203
--- /dev/null
+++ b/gfx/trainer/supernerd.png
diff --git a/gfx/trainer/swimmer_f.png b/gfx/trainer/swimmer_f.png
new file mode 100644
index 0000000..53d040a
--- /dev/null
+++ b/gfx/trainer/swimmer_f.png
diff --git a/gfx/trainer/swimmer_m.png b/gfx/trainer/swimmer_m.png
new file mode 100644
index 0000000..e143f9b
--- /dev/null
+++ b/gfx/trainer/swimmer_m.png
diff --git a/gfx/trainer/teacher_f.png b/gfx/trainer/teacher_f.png
new file mode 100644
index 0000000..8ba703b
--- /dev/null
+++ b/gfx/trainer/teacher_f.png
diff --git a/gfx/trainer/teacher_m.png b/gfx/trainer/teacher_m.png
new file mode 100644
index 0000000..66c1710
--- /dev/null
+++ b/gfx/trainer/teacher_m.png
diff --git a/gfx/trainer/tsukushi.png b/gfx/trainer/tsukushi.png
new file mode 100644
index 0000000..b898a86
--- /dev/null
+++ b/gfx/trainer/tsukushi.png
diff --git a/gfx/trainer/twins.png b/gfx/trainer/twins.png
new file mode 100644
index 0000000..0f8d4ed
--- /dev/null
+++ b/gfx/trainer/twins.png
diff --git a/gfx/trainer/youngster.png b/gfx/trainer/youngster.png
new file mode 100644
index 0000000..00ba41b
--- /dev/null
+++ b/gfx/trainer/youngster.png