ref: 56505958078db1c116aa883e0c7ecf631181475e
parent: 76d02feca02652febd87444a9f408e7c06ba0058
parent: 6b19b301f481e404a34ec3d90f35b23fba74b716
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Sat Jun 27 18:46:52 EDT 2020
Merge pull request #253 from Rangi42/master Individual images for party menu icon graphics
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -1723,15 +1723,4 @@
db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7
Audio1_Pitches:
- dw $F82C ; C_
- dw $F89D ; C#
- dw $F907 ; D_
- dw $F96B ; D#
- dw $F9CA ; E_
- dw $FA23 ; F_
- dw $FA77 ; F#
- dw $FAC7 ; G_
- dw $FB12 ; G#
- dw $FB58 ; A_
- dw $FB9B ; A#
- dw $FBDA ; B_
+INCLUDE "audio/notes.asm"
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1786,15 +1786,4 @@
db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7
Audio2_Pitches:
- dw $F82C ; C_
- dw $F89D ; C#
- dw $F907 ; D_
- dw $F96B ; D#
- dw $F9CA ; E_
- dw $FA23 ; F_
- dw $FA77 ; F#
- dw $FAC7 ; G_
- dw $FB12 ; G#
- dw $FB58 ; A_
- dw $FB9B ; A#
- dw $FBDA ; B_
+INCLUDE "audio/notes.asm"
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -1723,15 +1723,4 @@
db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7
Audio3_Pitches:
- dw $F82C ; C_
- dw $F89D ; C#
- dw $F907 ; D_
- dw $F96B ; D#
- dw $F9CA ; E_
- dw $FA23 ; F_
- dw $FA77 ; F#
- dw $FAC7 ; G_
- dw $FB12 ; G#
- dw $FB58 ; A_
- dw $FB9B ; A#
- dw $FBDA ; B_
+INCLUDE "audio/notes.asm"
--- /dev/null
+++ b/audio/notes.asm
@@ -1,0 +1,12 @@
+ dw $F82C ; C_
+ dw $F89D ; C#
+ dw $F907 ; D_
+ dw $F96B ; D#
+ dw $F9CA ; E_
+ dw $FA23 ; F_
+ dw $FA77 ; F#
+ dw $FAC7 ; G_
+ dw $FB12 ; G#
+ dw $FB58 ; A_
+ dw $FB9B ; A#
+ dw $FBDA ; B_
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -1,16 +1,16 @@
; pokemon's overworld sprites
const_value = 0
- const SPRITE_MON ; $0
- const SPRITE_BALL_M ; $1
- const SPRITE_HELIX ; $2
- const SPRITE_FAIRY ; $3
- const SPRITE_BIRD_M ; $4
- const SPRITE_WATER ; $5
- const SPRITE_BUG ; $6
- const SPRITE_GRASS ; $7
- const SPRITE_SNAKE ; $8
- const SPRITE_QUADRUPED ; $9
+ const ICON_MON ; $0
+ const ICON_BALL ; $1
+ const ICON_HELIX ; $2
+ const ICON_FAIRY ; $3
+ const ICON_BIRD ; $4
+ const ICON_WATER ; $5
+ const ICON_BUG ; $6
+ const ICON_GRASS ; $7
+ const ICON_SNAKE ; $8
+ const ICON_QUADRUPED ; $9
; overworld sprites
const_value = 1
--- a/data/mon_party_sprite_pointers.asm
+++ b/data/mon_party_sprite_pointers.asm
@@ -24,49 +24,49 @@
db BANK(SeelSprite)
dw vSprites + $140
- dw MonPartySprites + $40
+ dw BugIconFrame2
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(BugIconFrame2)
dw vSprites + $180
- dw MonPartySprites + $50
+ dw BugIconFrame2 + $10
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(BugIconFrame2)
dw vSprites + $1a0
- dw MonPartySprites + $60
+ dw PlantIconFrame2
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(PlantIconFrame2)
dw vSprites + $1c0
- dw MonPartySprites + $70
+ dw PlantIconFrame2 + $10
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(PlantIconFrame2)
dw vSprites + $1e0
- dw MonPartySprites + $80
+ dw SnakeIconFrame1
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(SnakeIconFrame1)
dw vSprites + $200
- dw MonPartySprites + $90
+ dw SnakeIconFrame1 + $10
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(SnakeIconFrame1)
dw vSprites + $220
- dw MonPartySprites + $A0
+ dw QuadrupedIconFrame1
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(QuadrupedIconFrame1)
dw vSprites + $240
- dw MonPartySprites + $B0
+ dw QuadrupedIconFrame1 + $10
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(QuadrupedIconFrame1)
dw vSprites + $260
- dw MonPartySprites + $100
+ dw TradeBubbleIconGFX
db $40 / $10 ; $40 bytes
- db BANK(MonPartySprites)
+ db BANK(TradeBubbleIconGFX)
dw vSprites + $380
dw SlowbroSprite
@@ -94,47 +94,47 @@
db BANK(SeelSprite)
dw vSprites + $540
- dw MonPartySprites
+ dw BugIconFrame1
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(BugIconFrame1)
dw vSprites + $580
- dw MonPartySprites + $10
+ dw BugIconFrame1 + $10
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(BugIconFrame1)
dw vSprites + $5a0
- dw MonPartySprites + $20
+ dw PlantIconFrame1
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(PlantIconFrame1)
dw vSprites + $5c0
- dw MonPartySprites + $30
+ dw PlantIconFrame1 + $10
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(PlantIconFrame1)
dw vSprites + $5E0
- dw MonPartySprites + $C0
+ dw SnakeIconFrame2
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(SnakeIconFrame2)
dw vSprites + $600
- dw MonPartySprites + $D0
+ dw SnakeIconFrame2 + $10
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(SnakeIconFrame2)
dw vSprites + $620
- dw MonPartySprites + $E0
+ dw QuadrupedIconFrame2
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(QuadrupedIconFrame2)
dw vSprites + $640
- dw MonPartySprites + $F0
+ dw QuadrupedIconFrame2 + $10
db $10 / $10 ; $10 bytes
- db BANK(MonPartySprites)
+ db BANK(QuadrupedIconFrame2)
dw vSprites + $660
- dw MonPartySprites + $140
+ dw TradeBubbleIconGFX + $40
db $40 / $10 ; $40 bytes
- db BANK(MonPartySprites)
+ db BANK(TradeBubbleIconGFX)
dw vSprites + $780
--- a/data/mon_party_sprites.asm
+++ b/data/mon_party_sprites.asm
@@ -1,77 +1,77 @@
MonPartyData:
- dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur
- dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander
- dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard
- dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle
- dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie
- dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree
- dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna
- dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey
- dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot
- dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate
- dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Spearow/Fearow
- dn SPRITE_SNAKE, SPRITE_SNAKE ;Ekans/Arbok
- dn SPRITE_FAIRY, SPRITE_FAIRY ;Pikachu/Raichu
- dn SPRITE_MON, SPRITE_MON ;Sandshrew/Sandslash
- dn SPRITE_MON, SPRITE_MON ;NidoranF/Nidorina
- dn SPRITE_MON, SPRITE_MON ;Nidoqueen/NidoranM
- dn SPRITE_MON, SPRITE_MON ;Nidorino/Nidoking
- dn SPRITE_FAIRY, SPRITE_FAIRY ;Clefairy/Clefable
- dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Vulpix/Ninetales
- dn SPRITE_FAIRY, SPRITE_FAIRY ;Jigglypuff/Wigglytuff
- dn SPRITE_MON, SPRITE_MON ;Zubat/Golbat
- dn SPRITE_GRASS, SPRITE_GRASS ;Oddish/Gloom
- dn SPRITE_GRASS, SPRITE_BUG ;Vileplume/Paras
- dn SPRITE_BUG, SPRITE_BUG ;Parasect/Venonat
- dn SPRITE_BUG, SPRITE_MON ;Venomoth/Diglett
- dn SPRITE_MON, SPRITE_MON ;Dugtrio/Meowth
- dn SPRITE_MON, SPRITE_MON ;Persian/Psyduck
- dn SPRITE_MON, SPRITE_MON ;Golduck/Mankey
- dn SPRITE_MON, SPRITE_QUADRUPED ;Primeape/Growlithe
- dn SPRITE_QUADRUPED, SPRITE_MON ;Arcanine/Poliwag
- dn SPRITE_MON, SPRITE_MON ;Poliwhirl/Poliwrath
- dn SPRITE_MON, SPRITE_MON ;Abra/Kadabra
- dn SPRITE_MON, SPRITE_MON ;Alakazam/Machop
- dn SPRITE_MON, SPRITE_MON ;Machoke/Machamp
- dn SPRITE_GRASS, SPRITE_GRASS ;Bellsprout/Weepinbell
- dn SPRITE_GRASS, SPRITE_WATER ;Victreebel/Tentacool
- dn SPRITE_WATER, SPRITE_MON ;Tentacruel/Geodude
- dn SPRITE_MON, SPRITE_MON ;Graveler/Golem
- dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Ponyta/Rapidash
- dn SPRITE_QUADRUPED, SPRITE_MON ;Slowpoke/Slowbro
- dn SPRITE_BALL_M, SPRITE_BALL_M ;Magnemite/Magneton
- dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Farfetch'd/Doduo
- dn SPRITE_BIRD_M, SPRITE_WATER ;Dodrio/Seel
- dn SPRITE_WATER, SPRITE_MON ;Dewgong/Grimer
- dn SPRITE_MON, SPRITE_HELIX ;Muk/Shellder
- dn SPRITE_HELIX, SPRITE_MON ;Cloyster/Gastly
- dn SPRITE_MON, SPRITE_MON ;Haunter/Gengar
- dn SPRITE_SNAKE, SPRITE_MON ;Onix/Drowzee
- dn SPRITE_MON, SPRITE_WATER ;Hypno/Krabby
- dn SPRITE_WATER, SPRITE_BALL_M ;Kingler/Voltorb
- dn SPRITE_BALL_M, SPRITE_GRASS ;Electrode/Exeggcute
- dn SPRITE_GRASS, SPRITE_MON ;Exeggutor/Cubone
- dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee
- dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung
- dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing
- dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon
- dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela
- dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea
- dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen
- dn SPRITE_WATER, SPRITE_HELIX ;Seaking/Staryu
- dn SPRITE_HELIX, SPRITE_MON ;Starmie/Mr.Mime
- dn SPRITE_BUG, SPRITE_MON ;Scyther/Jynx
- dn SPRITE_MON, SPRITE_MON ;Electabuzz/Magmar
- dn SPRITE_BUG, SPRITE_QUADRUPED ;Pinsir/Tauros
- dn SPRITE_WATER, SPRITE_SNAKE ;Magikarp/Gyarados
- dn SPRITE_WATER, SPRITE_MON ;Lapras/Ditto
- dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Eevee/Vaporeon
- dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Jolteon/Flareon
- dn SPRITE_MON, SPRITE_HELIX ;Porygon/Omanyte
- dn SPRITE_HELIX, SPRITE_HELIX ;Omastar/Kabuto
- dn SPRITE_HELIX, SPRITE_BIRD_M ;Kabutops/Aerodactyl
- dn SPRITE_MON, SPRITE_BIRD_M ;Snorlax/Articuno
- dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres
- dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair
- dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo
- dn SPRITE_MON, 0 ;Mew/Padding
+ dn ICON_GRASS, ICON_GRASS ; Bulbasaur / Ivysaur
+ dn ICON_GRASS, ICON_MON ; Venusaur / Charmander
+ dn ICON_MON, ICON_MON ; Charmeleon / Charizard
+ dn ICON_WATER, ICON_WATER ; Squirtle / Wartortle
+ dn ICON_WATER, ICON_BUG ; Blastoise / Caterpie
+ dn ICON_BUG, ICON_BUG ; Metapod / Butterfree
+ dn ICON_BUG, ICON_BUG ; Weedle / Kakuna
+ dn ICON_BUG, ICON_BIRD ; Beedrill / Pidgey
+ dn ICON_BIRD, ICON_BIRD ; Pidgeotto / Pidgeot
+ dn ICON_QUADRUPED, ICON_QUADRUPED ; Rattata / Raticate
+ dn ICON_BIRD, ICON_BIRD ; Spearow / Fearow
+ dn ICON_SNAKE, ICON_SNAKE ; Ekans / Arbok
+ dn ICON_FAIRY, ICON_FAIRY ; Pikachu / Raichu
+ dn ICON_MON, ICON_MON ; Sandshrew / Sandslash
+ dn ICON_MON, ICON_MON ; NidoranF / Nidorina
+ dn ICON_MON, ICON_MON ; Nidoqueen / NidoranM
+ dn ICON_MON, ICON_MON ; Nidorino / Nidoking
+ dn ICON_FAIRY, ICON_FAIRY ; Clefairy / Clefable
+ dn ICON_QUADRUPED, ICON_QUADRUPED ; Vulpix / Ninetales
+ dn ICON_FAIRY, ICON_FAIRY ; Jigglypuff / Wigglytuff
+ dn ICON_MON, ICON_MON ; Zubat / Golbat
+ dn ICON_GRASS, ICON_GRASS ; Oddish / Gloom
+ dn ICON_GRASS, ICON_BUG ; Vileplume / Paras
+ dn ICON_BUG, ICON_BUG ; Parasect / Venonat
+ dn ICON_BUG, ICON_MON ; Venomoth / Diglett
+ dn ICON_MON, ICON_MON ; Dugtrio / Meowth
+ dn ICON_MON, ICON_MON ; Persian / Psyduck
+ dn ICON_MON, ICON_MON ; Golduck / Mankey
+ dn ICON_MON, ICON_QUADRUPED ; Primeape / Growlithe
+ dn ICON_QUADRUPED, ICON_MON ; Arcanine / Poliwag
+ dn ICON_MON, ICON_MON ; Poliwhirl / Poliwrath
+ dn ICON_MON, ICON_MON ; Abra / Kadabra
+ dn ICON_MON, ICON_MON ; Alakazam / Machop
+ dn ICON_MON, ICON_MON ; Machoke / Machamp
+ dn ICON_GRASS, ICON_GRASS ; Bellsprout / Weepinbell
+ dn ICON_GRASS, ICON_WATER ; Victreebel / Tentacool
+ dn ICON_WATER, ICON_MON ; Tentacruel / Geodude
+ dn ICON_MON, ICON_MON ; Graveler / Golem
+ dn ICON_QUADRUPED, ICON_QUADRUPED ; Ponyta / Rapidash
+ dn ICON_QUADRUPED, ICON_MON ; Slowpoke / Slowbro
+ dn ICON_BALL, ICON_BALL ; Magnemite / Magneton
+ dn ICON_BIRD, ICON_BIRD ; Farfetch'd / Doduo
+ dn ICON_BIRD, ICON_WATER ; Dodrio / Seel
+ dn ICON_WATER, ICON_MON ; Dewgong / Grimer
+ dn ICON_MON, ICON_HELIX ; Muk / Shellder
+ dn ICON_HELIX, ICON_MON ; Cloyster / Gastly
+ dn ICON_MON, ICON_MON ; Haunter / Gengar
+ dn ICON_SNAKE, ICON_MON ; Onix / Drowzee
+ dn ICON_MON, ICON_WATER ; Hypno / Krabby
+ dn ICON_WATER, ICON_BALL ; Kingler / Voltorb
+ dn ICON_BALL, ICON_GRASS ; Electrode / Exeggcute
+ dn ICON_GRASS, ICON_MON ; Exeggutor / Cubone
+ dn ICON_MON, ICON_MON ; Marowak / Hitmonlee
+ dn ICON_MON, ICON_MON ; Hitmonchan / Lickitung
+ dn ICON_MON, ICON_MON ; Koffing / Weezing
+ dn ICON_QUADRUPED, ICON_MON ; Rhyhorn / Rhydon
+ dn ICON_FAIRY, ICON_GRASS ; Chansey / Tangela
+ dn ICON_MON, ICON_WATER ; Kangaskhan / Horsea
+ dn ICON_WATER, ICON_WATER ; Seadra / Goldeen
+ dn ICON_WATER, ICON_HELIX ; Seaking / Staryu
+ dn ICON_HELIX, ICON_MON ; Starmie / Mr.Mime
+ dn ICON_BUG, ICON_MON ; Scyther / Jynx
+ dn ICON_MON, ICON_MON ; Electabuzz / Magmar
+ dn ICON_BUG, ICON_QUADRUPED ; Pinsir / Tauros
+ dn ICON_WATER, ICON_SNAKE ; Magikarp / Gyarados
+ dn ICON_WATER, ICON_MON ; Lapras / Ditto
+ dn ICON_QUADRUPED, ICON_QUADRUPED ; Eevee / Vaporeon
+ dn ICON_QUADRUPED, ICON_QUADRUPED ; Jolteon / Flareon
+ dn ICON_MON, ICON_HELIX ; Porygon / Omanyte
+ dn ICON_HELIX, ICON_HELIX ; Omastar / Kabuto
+ dn ICON_HELIX, ICON_BIRD ; Kabutops / Aerodactyl
+ dn ICON_MON, ICON_BIRD ; Snorlax / Articuno
+ dn ICON_BIRD, ICON_BIRD ; Zapdos / Moltres
+ dn ICON_SNAKE, ICON_SNAKE ; Dratini / Dragonair
+ dn ICON_SNAKE, ICON_MON ; Dragonite / Mewtwo
+ dn ICON_MON, 0 ; Mew / padding
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -57,11 +57,11 @@
call AddNTimes
ld c, $40 ; amount to increase the tile id by
ld a, [hl]
- cp $4 ; tile ID for SPRITE_BALL_M
+ cp $4 ; tile ID for ICON_BALL
jr z, .editCoords
- cp $8 ; tile ID for SPRITE_HELIX
+ cp $8 ; tile ID for ICON_HELIX
jr nz, .editTileIDS
-; SPRITE_BALL_M and SPRITE_HELIX only shake up and down
+; ICON_BALL and ICON_HELIX only shake up and down
.editCoords
dec hl
dec hl ; dec hl to the OAM y coord
@@ -243,7 +243,7 @@
add $10
ld b, a
pop af
- cp SPRITE_HELIX << 2
+ cp ICON_HELIX << 2
jr z, .helix
call WriteSymmetricMonPartySpriteOAM
jr .makeCopy
@@ -280,5 +280,16 @@
INCLUDE "data/mon_party_sprites.asm"
-MonPartySprites:
- INCBIN "gfx/trade/mon_ow_sprites.2bpp"
+INC_FRAME_1 EQUS "0, $20"
+INC_FRAME_2 EQUS "$20, $20"
+
+BugIconFrame1: INCBIN "gfx/icons/bug.2bpp", INC_FRAME_1
+PlantIconFrame1: INCBIN "gfx/icons/plant.2bpp", INC_FRAME_1
+BugIconFrame2: INCBIN "gfx/icons/bug.2bpp", INC_FRAME_2
+PlantIconFrame2: INCBIN "gfx/icons/plant.2bpp", INC_FRAME_2
+SnakeIconFrame1: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_1
+QuadrupedIconFrame1: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_1
+SnakeIconFrame2: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_2
+QuadrupedIconFrame2: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_2
+
+TradeBubbleIconGFX: INCBIN "gfx/trade/bubble.2bpp"
binary files /dev/null b/gfx/icons/bug.png differ
binary files /dev/null b/gfx/icons/plant.png differ
binary files /dev/null b/gfx/icons/quadruped.png differ
binary files /dev/null b/gfx/icons/snake.png differ
binary files /dev/null b/gfx/trade/bubble.png differ
binary files a/gfx/trade/mon_ow_sprites.png /dev/null differ