Skip to content
Permalink
Browse files

Individual Pokémon sprites work (thanks to Crystal_'s advice)

  • Loading branch information...
roukaour committed May 5, 2016
1 parent 93ad719 commit 021503e00c5941e50fbee5b9da8497c04ee6abf3
Showing with 1,064 additions and 522 deletions.
  1. +3 −0 README.md
  2. +246 −70 constants/pokemon_data_constants.asm
  3. +14 −33 engine/mon_icons.asm
  4. BIN gfx/icon/abra.2bpp
  5. BIN gfx/icon/aerodactyl.2bpp
  6. BIN gfx/icon/aipom.2bpp
  7. BIN gfx/icon/alakazam.2bpp
  8. BIN gfx/icon/ampharos.2bpp
  9. BIN gfx/icon/arbok.2bpp
  10. BIN gfx/icon/arcanine.2bpp
  11. +1 −0 gfx/icon/ariados.2bpp
  12. +2 −0 gfx/icon/articuno.2bpp
  13. BIN gfx/icon/azumarill.2bpp
  14. BIN gfx/icon/bat.2bpp
  15. BIN gfx/icon/bayleef.2bpp
  16. BIN gfx/icon/beedrill.2bpp
  17. +1 −0 gfx/icon/bellossom.2bpp
  18. BIN gfx/icon/bellsprout.2bpp
  19. BIN gfx/icon/bigmon.2bpp
  20. BIN gfx/icon/bird.2bpp
  21. BIN gfx/icon/blastoise.2bpp
  22. BIN gfx/icon/blissey.2bpp
  23. BIN gfx/icon/blob.2bpp
  24. BIN gfx/icon/bug.2bpp
  25. BIN gfx/icon/butterfree.2bpp
  26. BIN gfx/icon/caterpie.2bpp
  27. BIN gfx/icon/caterpillar.2bpp
  28. BIN gfx/icon/celebi.2bpp
  29. BIN gfx/icon/chansey.2bpp
  30. BIN gfx/icon/charizard.2bpp
  31. BIN gfx/icon/charmeleon.2bpp
  32. BIN gfx/icon/chikorita.2bpp
  33. BIN gfx/icon/chinchou.2bpp
  34. BIN gfx/icon/clefable.2bpp
  35. BIN gfx/icon/cleffa.2bpp
  36. BIN gfx/icon/cloyster.2bpp
  37. BIN gfx/icon/corsola.2bpp
  38. +2 −0 gfx/icon/crobat.2bpp
  39. BIN gfx/icon/croconaw.2bpp
  40. BIN gfx/icon/cubone.2bpp
  41. BIN gfx/icon/cyndaquil.2bpp
  42. BIN gfx/icon/delibird.2bpp
  43. BIN gfx/icon/dewgong.2bpp
  44. BIN gfx/icon/ditto.2bpp
  45. BIN gfx/icon/dodrio.2bpp
  46. BIN gfx/icon/doduo.2bpp
  47. BIN gfx/icon/donphan.2bpp
  48. BIN gfx/icon/dragonair.2bpp
  49. +1 −0 gfx/icon/dragonite.2bpp
  50. BIN gfx/icon/dratini.2bpp
  51. BIN gfx/icon/drowzee.2bpp
  52. BIN gfx/icon/dugtrio.2bpp
  53. BIN gfx/icon/dunsparce.2bpp
  54. BIN gfx/icon/eevee.2bpp
  55. BIN gfx/icon/ekans.2bpp
  56. BIN gfx/icon/electabuzz.2bpp
  57. BIN gfx/icon/electrode.2bpp
  58. BIN gfx/icon/elekid.2bpp
  59. BIN gfx/icon/entei.2bpp
  60. BIN gfx/icon/equine.2bpp
  61. BIN gfx/icon/espeon.2bpp
  62. BIN gfx/icon/exeggcute.2bpp
  63. BIN gfx/icon/exeggutor.2bpp
  64. BIN gfx/icon/farfetch_d.2bpp
  65. BIN gfx/icon/fearow.2bpp
  66. BIN gfx/icon/feraligatr.2bpp
  67. BIN gfx/icon/fighter.2bpp
  68. BIN gfx/icon/fish.2bpp
  69. BIN gfx/icon/flaaffy.2bpp
  70. BIN gfx/icon/flareon.2bpp
  71. BIN gfx/icon/forretress.2bpp
  72. BIN gfx/icon/fox.2bpp
  73. BIN gfx/icon/furret.2bpp
  74. BIN gfx/icon/gastly.2bpp
  75. BIN gfx/icon/gengar.2bpp
  76. BIN gfx/icon/ghost.2bpp
  77. BIN gfx/icon/girafarig.2bpp
  78. BIN gfx/icon/gligar.2bpp
  79. BIN gfx/icon/gloom.2bpp
  80. +3 −0 gfx/icon/golbat.2bpp
  81. BIN gfx/icon/goldeen.2bpp
  82. BIN gfx/icon/golduck.2bpp
  83. BIN gfx/icon/golem.2bpp
  84. BIN gfx/icon/granbull.2bpp
  85. BIN gfx/icon/graveler.2bpp
  86. BIN gfx/icon/grimer.2bpp
  87. BIN gfx/icon/growlithe.2bpp
  88. BIN gfx/icon/haunter.2bpp
  89. BIN gfx/icon/heracross.2bpp
  90. +2 −0 gfx/icon/hitmonchan.2bpp
  91. BIN gfx/icon/hitmonlee.2bpp
  92. +1 −0 gfx/icon/hitmontop.2bpp
  93. BIN gfx/icon/hoothoot.2bpp
  94. BIN gfx/icon/hoppip.2bpp
  95. BIN gfx/icon/horsea.2bpp
  96. BIN gfx/icon/houndoom.2bpp
  97. BIN gfx/icon/houndour.2bpp
  98. BIN gfx/icon/humanshape.2bpp
  99. +1 −0 gfx/icon/hypno.2bpp
  100. BIN gfx/icon/igglybuff.2bpp
  101. BIN gfx/icon/ivysaur.2bpp
  102. BIN gfx/icon/jellyfish.2bpp
  103. BIN gfx/icon/jolteon.2bpp
  104. BIN gfx/icon/jumpluff.2bpp
  105. +1 −0 gfx/icon/jynx.2bpp
  106. BIN gfx/icon/kabuto.2bpp
  107. BIN gfx/icon/kabutops.2bpp
  108. +1 −0 gfx/icon/kadabra.2bpp
  109. BIN gfx/icon/kakuna.2bpp
  110. BIN gfx/icon/kangaskhan.2bpp
  111. +1 −0 gfx/icon/kingdra.2bpp
  112. BIN gfx/icon/kingler.2bpp
  113. BIN gfx/icon/koffing.2bpp
  114. BIN gfx/icon/krabby.2bpp
  115. BIN gfx/icon/lanturn.2bpp
  116. BIN gfx/icon/larvitar.2bpp
  117. BIN gfx/icon/ledian.2bpp
  118. +1 −0 gfx/icon/ledyba.2bpp
  119. BIN gfx/icon/lickitung.2bpp
  120. BIN gfx/icon/machamp.2bpp
  121. BIN gfx/icon/machoke.2bpp
  122. BIN gfx/icon/machop.2bpp
  123. BIN gfx/icon/magby.2bpp
  124. BIN gfx/icon/magcargo.2bpp
  125. BIN gfx/icon/magikarp.2bpp
  126. BIN gfx/icon/magmar.2bpp
  127. BIN gfx/icon/magnemite.2bpp
  128. BIN gfx/icon/magneton.2bpp
  129. BIN gfx/icon/mankey.2bpp
  130. BIN gfx/icon/mantine.2bpp
  131. BIN gfx/icon/mareep.2bpp
  132. BIN gfx/icon/marill.2bpp
  133. +3 −0 gfx/icon/marowak.2bpp
  134. BIN gfx/icon/meganium.2bpp
  135. BIN gfx/icon/meowth.2bpp
  136. BIN gfx/icon/metapod.2bpp
  137. BIN gfx/icon/mew.2bpp
  138. BIN gfx/icon/mewtwo.2bpp
  139. BIN gfx/icon/miltank.2bpp
  140. BIN gfx/icon/misdreavus.2bpp
  141. BIN gfx/icon/moltres.2bpp
  142. BIN gfx/icon/monster.2bpp
  143. BIN gfx/icon/moth.2bpp
  144. BIN gfx/icon/mr__mime.2bpp
  145. BIN gfx/icon/muk.2bpp
  146. BIN gfx/icon/murkrow.2bpp
  147. BIN gfx/icon/natu.2bpp
  148. BIN gfx/icon/nidoking.2bpp
  149. BIN gfx/icon/nidoqueen.2bpp
  150. BIN gfx/icon/nidoran_f.2bpp
  151. BIN gfx/icon/nidoran_m.2bpp
  152. BIN gfx/icon/nidorina.2bpp
  153. BIN gfx/icon/nidorino.2bpp
  154. BIN gfx/icon/ninetales.2bpp
  155. BIN gfx/icon/noctowl.2bpp
  156. BIN gfx/icon/octillery.2bpp
  157. BIN gfx/icon/omanyte.2bpp
  158. +1 −0 gfx/icon/omastar.2bpp
  159. BIN gfx/icon/onix.2bpp
  160. BIN gfx/icon/paras.2bpp
  161. BIN gfx/icon/parasect.2bpp
  162. BIN gfx/icon/persian.2bpp
  163. BIN gfx/icon/phanpy.2bpp
  164. BIN gfx/icon/pichu.2bpp
  165. BIN gfx/icon/pidgeot.2bpp
  166. BIN gfx/icon/pidgeotto.2bpp
  167. BIN gfx/icon/pidgey.2bpp
  168. +1 −0 gfx/icon/piloswine.2bpp
  169. BIN gfx/icon/pineco.2bpp
  170. +1 −0 gfx/icon/pinsir.2bpp
  171. BIN gfx/icon/politoed.2bpp
  172. BIN gfx/icon/poliwhirl.2bpp
  173. BIN gfx/icon/poliwrath.2bpp
  174. BIN gfx/icon/ponyta.2bpp
  175. BIN gfx/icon/porygon.2bpp
  176. BIN gfx/icon/porygon2.2bpp
  177. BIN gfx/icon/primeape.2bpp
  178. +1 −0 gfx/icon/psyduck.2bpp
  179. BIN gfx/icon/pupitar.2bpp
  180. BIN gfx/icon/quagsire.2bpp
  181. BIN gfx/icon/quilava.2bpp
  182. BIN gfx/icon/qwilfish.2bpp
  183. BIN gfx/icon/raichu.2bpp
  184. BIN gfx/icon/raikou.2bpp
  185. BIN gfx/icon/rapidash.2bpp
  186. BIN gfx/icon/raticate.2bpp
  187. BIN gfx/icon/rattata.2bpp
  188. BIN gfx/icon/remoraid.2bpp
  189. BIN gfx/icon/rhydon.2bpp
  190. BIN gfx/icon/rhyhorn.2bpp
  191. BIN gfx/icon/sandshrew.2bpp
  192. BIN gfx/icon/sandslash.2bpp
  193. BIN gfx/icon/scizor.2bpp
  194. BIN gfx/icon/scyther.2bpp
  195. BIN gfx/icon/seadra.2bpp
  196. BIN gfx/icon/seaking.2bpp
  197. BIN gfx/icon/seel.2bpp
  198. +1 −0 gfx/icon/sentret.2bpp
  199. BIN gfx/icon/serpent.2bpp
  200. BIN gfx/icon/shell.2bpp
  201. BIN gfx/icon/shellder.2bpp
  202. BIN gfx/icon/shuckle.2bpp
  203. BIN gfx/icon/skarmory.2bpp
  204. BIN gfx/icon/skiploom.2bpp
  205. BIN gfx/icon/slowbro.2bpp
  206. +1 −0 gfx/icon/slowking.2bpp
  207. BIN gfx/icon/slugma.2bpp
  208. BIN gfx/icon/smeargle.2bpp
  209. BIN gfx/icon/smoochum.2bpp
  210. BIN gfx/icon/sneasel.2bpp
  211. BIN gfx/icon/snubbull.2bpp
  212. BIN gfx/icon/spearow.2bpp
  213. BIN gfx/icon/spinarak.2bpp
  214. BIN gfx/icon/stantler.2bpp
  215. BIN gfx/icon/starmie.2bpp
  216. +2 −0 gfx/icon/steelix.2bpp
  217. BIN gfx/icon/suicune.2bpp
  218. +1 −0 gfx/icon/sunflora.2bpp
  219. +1 −0 gfx/icon/sunkern.2bpp
  220. BIN gfx/icon/swinub.2bpp
  221. BIN gfx/icon/tangela.2bpp
  222. BIN gfx/icon/tauros.2bpp
  223. BIN gfx/icon/teddiursa.2bpp
  224. BIN gfx/icon/tentacool.2bpp
  225. BIN gfx/icon/tentacruel.2bpp
  226. BIN gfx/icon/togepi.2bpp
  227. BIN gfx/icon/togetic.2bpp
  228. BIN gfx/icon/totodile.2bpp
  229. BIN gfx/icon/typhlosion.2bpp
  230. BIN gfx/icon/tyranitar.2bpp
  231. BIN gfx/icon/tyrogue.2bpp
  232. BIN gfx/icon/umbreon.2bpp
  233. BIN gfx/icon/ursaring.2bpp
  234. BIN gfx/icon/vaporeon.2bpp
  235. BIN gfx/icon/venomoth.2bpp
  236. BIN gfx/icon/venonat.2bpp
  237. BIN gfx/icon/venusaur.2bpp
  238. BIN gfx/icon/victreebel.2bpp
  239. BIN gfx/icon/vileplume.2bpp
  240. BIN gfx/icon/vulpix.2bpp
  241. BIN gfx/icon/wartortle.2bpp
  242. BIN gfx/icon/weedle.2bpp
  243. BIN gfx/icon/weepinbell.2bpp
  244. BIN gfx/icon/weezing.2bpp
  245. BIN gfx/icon/wigglytuff.2bpp
  246. BIN gfx/icon/wobbuffet.2bpp
  247. BIN gfx/icon/wooper.2bpp
  248. BIN gfx/icon/xatu.2bpp
  249. BIN gfx/icon/yanma.2bpp
  250. +2 −0 gfx/icon/zapdos.2bpp
  251. BIN gfx/icon/zubat.2bpp
  252. +0 −8 main.asm
  253. +515 −251 menu/mon_icons.asm
  254. +128 −80 menu/mon_icons_1.asm
  255. +125 −80 menu/mon_icons_2.asm
@@ -47,6 +47,8 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
* Elixer → Elixir
* whited out → blacked out
* Refer to badges as "the"
* Graphics updates:
* Individual party/day-care icons for each Pokémon
* No badge boosts to stats or types
* New default player names

@@ -91,6 +93,7 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
* More likely to find roaming Pokémon when on the correct route
* Select reorders Pokémon in party menu
* Aesthetics:
* Color party/day-care sprites by species
* Higher levels and better moves and held items from HGSS
* Fourth stat screen showing Poké Seer's data
* Better Substitute sprite
@@ -28,82 +28,258 @@ const_value SET 1

; menu sprites
const_value SET 1
const ICON_POLIWAG
const ICON_JIGGLYPUFF
const ICON_DIGLETT
const ICON_BULBASAUR
const ICON_IVYSAUR
const ICON_VENUSAUR
const ICON_CHARMANDER
const ICON_CHARMELEON
const ICON_CHARIZARD
const ICON_SQUIRTLE
const ICON_WARTORTLE
const ICON_BLASTOISE
const ICON_CATERPIE
const ICON_METAPOD
const ICON_BUTTERFREE
const ICON_WEEDLE
const ICON_KAKUNA
const ICON_BEEDRILL
const ICON_PIDGEY
const ICON_PIDGEOTTO
const ICON_PIDGEOT
const ICON_RATTATA
const ICON_RATICATE
const ICON_SPEAROW
const ICON_FEAROW
const ICON_EKANS
const ICON_ARBOK
const ICON_PIKACHU
const ICON_STARYU
const ICON_FISH
const ICON_BIRD
const ICON_MONSTER
const ICON_RAICHU
const ICON_SANDSHREW
const ICON_SANDSLASH
const ICON_NIDORAN_F
const ICON_NIDORINA
const ICON_NIDOQUEEN
const ICON_NIDORAN_M
const ICON_NIDORINO
const ICON_NIDOKING
const ICON_CLEFAIRY
const ICON_CLEFABLE
const ICON_VULPIX
const ICON_NINETALES
const ICON_JIGGLYPUFF
const ICON_WIGGLYTUFF
const ICON_ZUBAT
const ICON_GOLBAT
const ICON_ODDISH
const ICON_BUG
const ICON_GHOST
const ICON_LAPRAS
const ICON_HUMANSHAPE
const ICON_FOX
const ICON_EQUINE
const ICON_SHELL
const ICON_BLOB
const ICON_SERPENT
const ICON_VOLTORB
const ICON_SQUIRTLE
const ICON_BULBASAUR
const ICON_CHARMANDER
const ICON_CATERPILLAR
const ICON_UNOWN
const ICON_GLOOM
const ICON_VILEPLUME
const ICON_PARAS
const ICON_PARASECT
const ICON_VENONAT
const ICON_VENOMOTH
const ICON_DIGLETT
const ICON_DUGTRIO
const ICON_MEOWTH
const ICON_PERSIAN
const ICON_PSYDUCK
const ICON_GOLDUCK
const ICON_MANKEY
const ICON_PRIMEAPE
const ICON_GROWLITHE
const ICON_ARCANINE
const ICON_POLIWAG
const ICON_POLIWHIRL
const ICON_POLIWRATH
const ICON_ABRA
const ICON_KADABRA
const ICON_ALAKAZAM
const ICON_MACHOP
const ICON_MACHOKE
const ICON_MACHAMP
const ICON_BELLSPROUT
const ICON_WEEPINBELL
const ICON_VICTREEBEL
const ICON_TENTACOOL
const ICON_TENTACRUEL
const ICON_GEODUDE
const ICON_FIGHTER
const ICON_EGG
const ICON_JELLYFISH
const ICON_MOTH
const ICON_BAT
const ICON_SNORLAX
const ICON_HO_OH
const ICON_LUGIA
const ICON_GYARADOS
const ICON_GRAVELER
const ICON_GOLEM
const ICON_PONYTA
const ICON_RAPIDASH
const ICON_SLOWPOKE
const ICON_SLOWBRO
const ICON_MAGNEMITE
const ICON_MAGNETON
const ICON_FARFETCH_D
const ICON_DODUO
const ICON_DODRIO
const ICON_SEEL
const ICON_DEWGONG
const ICON_GRIMER
const ICON_MUK
const ICON_SHELLDER
const ICON_CLOYSTER
const ICON_GASTLY
const ICON_HAUNTER
const ICON_GENGAR
const ICON_ONIX
const ICON_DROWZEE
const ICON_HYPNO
const ICON_KRABBY
const ICON_KINGLER
const ICON_VOLTORB
const ICON_ELECTRODE
const ICON_EXEGGCUTE
const ICON_EXEGGUTOR
const ICON_CUBONE
const ICON_MAROWAK
const ICON_HITMONLEE
const ICON_HITMONCHAN
const ICON_LICKITUNG
const ICON_KOFFING
const ICON_WEEZING
const ICON_RHYHORN
const ICON_RHYDON
const ICON_CHANSEY
const ICON_TANGELA
const ICON_KANGASKHAN
const ICON_HORSEA
const ICON_SEADRA
const ICON_GOLDEEN
const ICON_SEAKING
const ICON_STARYU
const ICON_STARMIE
const ICON_MR__MIME
const ICON_SCYTHER
const ICON_JYNX
const ICON_ELECTABUZZ
const ICON_MAGMAR
const ICON_PINSIR
const ICON_TAUROS
const ICON_MAGIKARP
const ICON_GYARADOS
const ICON_LAPRAS
const ICON_DITTO
const ICON_EEVEE
const ICON_VAPOREON
const ICON_JOLTEON
const ICON_FLAREON
const ICON_PORYGON
const ICON_OMANYTE
const ICON_OMASTAR
const ICON_KABUTO
const ICON_KABUTOPS
const ICON_AERODACTYL
const ICON_SNORLAX
const ICON_ARTICUNO
const ICON_ZAPDOS
const ICON_MOLTRES
const ICON_DRATINI
const ICON_DRAGONAIR
const ICON_DRAGONITE
const ICON_MEWTWO
const ICON_MEW
const ICON_CHIKORITA
const ICON_BAYLEEF
const ICON_MEGANIUM
const ICON_CYNDAQUIL
const ICON_QUILAVA
const ICON_TYPHLOSION
const ICON_TOTODILE
const ICON_CROCONAW
const ICON_FERALIGATR
const ICON_SENTRET
const ICON_FURRET
const ICON_HOOTHOOT
const ICON_NOCTOWL
const ICON_LEDYBA
const ICON_LEDIAN
const ICON_SPINARAK
const ICON_ARIADOS
const ICON_CROBAT
const ICON_CHINCHOU
const ICON_LANTURN
const ICON_PICHU
const ICON_CLEFFA
const ICON_IGGLYBUFF
const ICON_TOGEPI
const ICON_TOGETIC
const ICON_NATU
const ICON_XATU
const ICON_MAREEP
const ICON_FLAAFFY
const ICON_AMPHAROS
const ICON_BELLOSSOM
const ICON_MARILL
const ICON_AZUMARILL
const ICON_SUDOWOODO
const ICON_BIGMON
const ICON_POLIWAG2
const ICON_JIGGLYPUFF2
const ICON_DIGLETT2
const ICON_PIKACHU2
const ICON_STARYU2
const ICON_FISH2
const ICON_BIRD2
const ICON_MONSTER2
const ICON_CLEFAIRY2
const ICON_ODDISH2
const ICON_BUG2
const ICON_GHOST2
const ICON_LAPRAS2
const ICON_HUMANSHAPE2
const ICON_FOX2
const ICON_EQUINE2
const ICON_SHELL2
const ICON_BLOB2
const ICON_SERPENT2
const ICON_VOLTORB2
const ICON_SQUIRTLE2
const ICON_BULBASAUR2
const ICON_CHARMANDER2
const ICON_CATERPILLAR2
const ICON_UNOWN2
const ICON_GEODUDE2
const ICON_FIGHTER2
const ICON_EGG2
const ICON_JELLYFISH2
const ICON_MOTH2
const ICON_BAT2
const ICON_SNORLAX2
const ICON_HO_OH2
const ICON_LUGIA2
const ICON_GYARADOS2
const ICON_SLOWPOKE2
const ICON_SUDOWOODO2
const ICON_BIGMON2
const ICON_POLITOED
const ICON_HOPPIP
const ICON_SKIPLOOM
const ICON_JUMPLUFF
const ICON_AIPOM
const ICON_SUNKERN
const ICON_SUNFLORA
const ICON_YANMA
const ICON_WOOPER
const ICON_QUAGSIRE
const ICON_ESPEON
const ICON_UMBREON
const ICON_MURKROW
const ICON_SLOWKING
const ICON_MISDREAVUS
const ICON_UNOWN
const ICON_WOBBUFFET
const ICON_GIRAFARIG
const ICON_PINECO
const ICON_FORRETRESS
const ICON_DUNSPARCE
const ICON_GLIGAR
const ICON_STEELIX
const ICON_SNUBBULL
const ICON_GRANBULL
const ICON_QWILFISH
const ICON_SCIZOR
const ICON_SHUCKLE
const ICON_HERACROSS
const ICON_SNEASEL
const ICON_TEDDIURSA
const ICON_URSARING
const ICON_SLUGMA
const ICON_MAGCARGO
const ICON_SWINUB
const ICON_PILOSWINE
const ICON_CORSOLA
const ICON_REMORAID
const ICON_OCTILLERY
const ICON_DELIBIRD
const ICON_MANTINE
const ICON_SKARMORY
const ICON_HOUNDOUR
const ICON_HOUNDOOM
const ICON_KINGDRA
const ICON_PHANPY
const ICON_DONPHAN
const ICON_PORYGON2
const ICON_STANTLER
const ICON_SMEARGLE
const ICON_TYROGUE
const ICON_HITMONTOP
const ICON_SMOOCHUM
const ICON_ELEKID
const ICON_MAGBY
const ICON_MILTANK
const ICON_BLISSEY
const ICON_RAIKOU
const ICON_ENTEI
const ICON_SUICUNE
const ICON_LARVITAR
const ICON_PUPITAR
const ICON_TYRANITAR
const ICON_LUGIA
const ICON_HO_OH
const ICON_CELEBI
const ICON_EGG

; evolution types
const_value SET 1

0 comments on commit 021503e

Please sign in to comment.
You can’t perform that action at this time.