Skip to content

Commit

Permalink
Color Party Menu Icons by Species
Browse files Browse the repository at this point in the history 
From wiki tutorial.
  • Loading branch information
vanlach authored and vanlach committed Jun 4, 2020
1 parent e3ebd99 commit c26d881
Show file tree
Hide file tree
Showing 9 changed files with 417 additions and 91 deletions.
13 changes: 12 additions & 1 deletion constants/icon_constants.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,4 +262,15 @@
const MONICON_TRADE
const MONICON_MOBILE1
const MONICON_MOBILE2
const MONICON_UNUSED
const MONICON_UNUSED

; party menu icon palettes
const_def
const PAL_ICON_RED ; 0
const PAL_ICON_BLUE ; 1
const PAL_ICON_GREEN ; 2
const PAL_ICON_BROWN ; 3
const PAL_ICON_PINK ; 4
const PAL_ICON_GRAY ; 5
const PAL_ICON_TEAL ; 6
const PAL_ICON_PURPLE ; 7
2 changes: 2 additions & 0 deletions constants/sprite_anim_constants.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,3 +316,5 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9 ; 89
const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10 ; 8a
const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11 ; 8b
const SPRITE_ANIM_OAMSET_PARTY_MON_1 ; 8c
const SPRITE_ANIM_OAMSET_PARTY_MON_2 ; 8d
260 changes: 260 additions & 0 deletions data/pokemon/menu_icon_pals.asm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
icon_pals: MACRO
dn PAL_ICON_\1, PAL_ICON_\2
ENDM

MonMenuIconPals:
; normal, shiny
icon_pals TEAL, GREEN ; Bulbasaur
icon_pals TEAL, GREEN ; Ivysaur
icon_pals TEAL, GREEN ; Venusaur
icon_pals RED, BROWN ; Charmander
icon_pals RED, BROWN ; Charmeleon
icon_pals RED, PURPLE ; Charizard
icon_pals BLUE, TEAL ; Squirtle
icon_pals BLUE, TEAL ; Wartortle
icon_pals BLUE, TEAL ; Blastoise
icon_pals GREEN, PINK ; Caterpie
icon_pals GREEN, RED ; Metapod
icon_pals BLUE, RED ; Butterfree
icon_pals BROWN, PINK ; Weedle
icon_pals BROWN, GREEN ; Kakuna
icon_pals BROWN, TEAL ; Beedrill
icon_pals BROWN, RED ; Pidgey
icon_pals BROWN, RED ; Pidgeotto
icon_pals BROWN, RED ; Pidgeot
icon_pals PURPLE, GRAY ; Rattata
icon_pals BROWN, RED ; Raticate
icon_pals BROWN, RED ; Spearow
icon_pals BROWN, PINK ; Fearow
icon_pals PURPLE, BROWN ; Ekans
icon_pals PURPLE, BROWN ; Arbok
icon_pals BROWN, RED ; Pikachu
icon_pals BROWN, RED ; Raichu
icon_pals BROWN, GREEN ; Sandshrew
icon_pals BROWN, RED ; Sandslash
icon_pals TEAL, PURPLE ; Nidoran_f
icon_pals TEAL, PURPLE ; Nidorina
icon_pals TEAL, GREEN ; Nidoqueen
icon_pals PURPLE, TEAL ; Nidoran_m
icon_pals PURPLE, TEAL ; Nidorino
icon_pals PURPLE, BLUE ; Nidoking
icon_pals PINK, GREEN ; CLEFAIRY
icon_pals PINK, GREEN ; Clefable
icon_pals RED, BROWN ; Vulpix
icon_pals BROWN, GRAY ; Ninetales
icon_pals PINK, GREEN ; Jigglypuff
icon_pals PINK, RED ; Wigglytuff
icon_pals BLUE, GREEN ; Zubat
icon_pals BLUE, GREEN ; Golbat
icon_pals BLUE, GREEN ; Oddish
icon_pals BLUE, GREEN ; Gloom
icon_pals BLUE, GREEN ; Vileplume
icon_pals BROWN, RED ; Paras
icon_pals BROWN, RED ; Parasect
icon_pals PURPLE, BLUE ; Venonat
icon_pals PINK, BLUE ; Venomoth
icon_pals BROWN, BLUE ; Diglett
icon_pals BROWN, BLUE ; Dugtrio
icon_pals GRAY, BROWN ; Meowth
icon_pals BROWN, GRAY ; Persian
icon_pals BROWN, TEAL ; Psyduck
icon_pals TEAL, BLUE ; Golduck
icon_pals BROWN, GREEN ; Mankey
icon_pals BROWN, GREEN ; Primeape
icon_pals RED, BROWN ; Growlithe
icon_pals RED, BROWN ; Arcanine
icon_pals BLUE, TEAL ; Poliwag
icon_pals BLUE, TEAL ; Poliwhirl
icon_pals BLUE, GREEN ; Poliwrath
icon_pals BROWN, GRAY ; Abra
icon_pals BROWN, GRAY ; Kadabra
icon_pals BROWN, PINK ; Alakazam
icon_pals TEAL, BROWN ; Machop
icon_pals PURPLE, GREEN ; Machoke
icon_pals GRAY, GREEN ; Machamp
icon_pals GREEN, BROWN ; Bellsprout
icon_pals GREEN, BROWN ; Weepinbell
icon_pals GREEN, BROWN ; Victreebel
icon_pals BLUE, PURPLE ; Tentacool
icon_pals BLUE, PURPLE ; Tentacruel
icon_pals GRAY, BROWN ; Geodude
icon_pals GRAY, BROWN ; Graveler
icon_pals GRAY, BROWN ; Golem
icon_pals RED, BLUE ; Ponyta
icon_pals RED, PURPLE ; Rapidash
icon_pals PINK, PURPLE ; Slowpoke
icon_pals PINK, PURPLE ; Slowbro
icon_pals GRAY, BROWN ; Magnemite
icon_pals GRAY, BROWN ; Magneton
icon_pals BROWN, PINK ; Farfetch'd
icon_pals BROWN, GREEN ; Doduo
icon_pals BROWN, GREEN ; Dodrio
icon_pals GRAY, BROWN ; Seel
icon_pals GRAY, BROWN ; Dewgong
icon_pals PURPLE, GREEN ; Grimer
icon_pals PURPLE, GREEN ; Muk
icon_pals PURPLE, RED ; Shellder
icon_pals PURPLE, BLUE ; Cloyster
icon_pals PURPLE, TEAL ; Gastly
icon_pals PURPLE, TEAL ; Haunter
icon_pals PURPLE, TEAL ; Gengar
icon_pals GRAY, GREEN ; Onix
icon_pals BROWN, PINK ; Drowzee
icon_pals BROWN, PINK ; Hypno
icon_pals RED, BROWN ; Krabby
icon_pals RED, GREEN ; Kingler
icon_pals RED, BLUE ; Voltorb
icon_pals RED, BLUE ; Electrode
icon_pals PINK, BROWN ; Exeggcute
icon_pals PINK, BROWN ; Exeggutor
icon_pals BROWN, GREEN ; Cubone
icon_pals BROWN, GREEN ; Marowak
icon_pals BROWN, GREEN ; Hitmonlee
icon_pals BROWN, BLUE ; Hitmonchan
icon_pals PINK, BROWN ; Lickitung
icon_pals PURPLE, TEAL ; Koffing
icon_pals PURPLE, TEAL ; Weezing
icon_pals GRAY, RED ; Rhyhorn
icon_pals GRAY, BROWN ; Rhydon
icon_pals PINK, GREEN ; Chansey
icon_pals BLUE, GREEN ; Tangela
icon_pals BROWN, GRAY ; Kangaskhan
icon_pals TEAL, GREEN ; Horsea
icon_pals TEAL, PURPLE ; Seadra
icon_pals RED, BROWN ; Goldeen
icon_pals RED, BROWN ; Seaking
icon_pals BROWN, BLUE ; Staryu
icon_pals PURPLE, BLUE ; Starmie
icon_pals PINK, GREEN ; Mr. Mime
icon_pals GREEN, TEAL ; Scyther
icon_pals RED, PINK ; Jynx
icon_pals BROWN, RED ; Electabuzz
icon_pals RED, PINK ; Magmar
icon_pals BROWN, PURPLE ; Pinsir
icon_pals BROWN, GREEN ; Tauros
icon_pals RED, BROWN ; Magikarp
icon_pals BLUE, RED ; Gyarados
icon_pals BLUE, PURPLE ; Lapras
icon_pals PURPLE, BLUE ; Ditto
icon_pals BROWN, GRAY ; Eevee
icon_pals BLUE, PURPLE ; Vaporeon
icon_pals BROWN, GREEN ; Jolteon
icon_pals RED, BROWN ; Flareon
icon_pals TEAL, PURPLE ; Porygon
icon_pals TEAL, PURPLE ; Omanyte
icon_pals TEAL, PURPLE ; Omastar
icon_pals BROWN, GREEN ; Kabuto
icon_pals BROWN, GREEN ; Kabutops
icon_pals GRAY, PURPLE ; Aerodactyl
icon_pals GREEN, BLUE ; Snorlax
icon_pals BLUE, GRAY ; Articuno
icon_pals BROWN, RED ; Zapdos
icon_pals RED, PINK ; Moltres
icon_pals TEAL, PINK ; Dratini
icon_pals TEAL, PINK ; Dragonair
icon_pals BROWN, GREEN ; Dragonite
icon_pals PURPLE, GREEN ; Mewtwo
icon_pals PINK, TEAL ; Mew
icon_pals GREEN, BROWN ; Chikorita
icon_pals GREEN, BROWN ; Bayleef
icon_pals GREEN, BROWN ; Meganium
icon_pals TEAL, BROWN ; Cyndaquil
icon_pals TEAL, BROWN ; Quilava
icon_pals TEAL, BROWN ; Typhlosion
icon_pals BLUE, TEAL ; Totodile
icon_pals BLUE, TEAL ; Coroconaw
icon_pals BLUE, TEAL ; Feraligatr
icon_pals BROWN, GRAY ; Sentret
icon_pals BROWN, PINK ; Furret
icon_pals BROWN, GRAY ; Hoothoot
icon_pals BROWN, RED ; Noctowl
icon_pals RED, BROWN ; Ledyba
icon_pals RED, BROWN ; Ledian
icon_pals GREEN, TEAL ; Spinarak
icon_pals RED, PINK ; Ariados
icon_pals PURPLE, PINK ; Crobat
icon_pals BLUE, TEAL ; Chinchou
icon_pals BLUE, PURPLE ; Lanturn
icon_pals BROWN, RED ; Pichu
icon_pals BROWN, PINK ; Cleffa
icon_pals GRAY, PINK ; Igglybuff
icon_pals GRAY, PINK ; Togepi
icon_pals RED, BLUE ; Togetic
icon_pals GREEN, BROWN ; Natu
icon_pals GREEN, BROWN ; Xatu
icon_pals BROWN, PINK ; Mareep
icon_pals PINK, GREEN ; Flaafy
icon_pals BROWN, PINK ; Ampharos
icon_pals GREEN, PURPLE ; Bellossom
icon_pals BLUE, GREEN ; Marill
icon_pals BLUE, RED ; Azumarill
icon_pals BROWN, GREEN ; Sudowoodo
icon_pals GREEN, BLUE ; Politoed
icon_pals PINK, GREEN ; Hoppip
icon_pals GREEN, PINK ; Skiploom
icon_pals BLUE, PINK ; Jumpluff
icon_pals PURPLE, PINK ; Aipom
icon_pals BROWN, RED ; Sunkern
icon_pals GREEN, BROWN ; Sunflora
icon_pals RED, BLUE ; Yanma
icon_pals BLUE, PINK ; Wooper
icon_pals BLUE, PINK ; Quagsire
icon_pals PINK, GREEN ; Espeon
icon_pals GRAY, BLUE ; Umbreon
icon_pals GRAY, PINK ; Murkrow
icon_pals PINK, BLUE ; Slowking
icon_pals TEAL, GREEN ; Misdreavus
icon_pals GRAY, BLUE ; Unown
icon_pals BLUE, PINK ; Wobbuffet
icon_pals BROWN, BLUE ; Girafarig
icon_pals TEAL, BROWN ; Pineco
icon_pals RED, BROWN ; Forretress
icon_pals BLUE, PINK ; Dunsparce
icon_pals PINK, PURPLE ; Gligar
icon_pals GRAY, BROWN ; Steelix
icon_pals PINK, PURPLE ; Snubbull
icon_pals PURPLE, BROWN ; Granbull
icon_pals TEAL, PURPLE ; Qwilfish
icon_pals RED, GREEN ; Scizor
icon_pals RED, BLUE ; Shuckle
icon_pals BLUE, PINK ; Heracross
icon_pals BLUE, PINK ; Sneasel
icon_pals BROWN, GREEN ; Teddiursa
icon_pals BROWN, GREEN ; Ursaring
icon_pals RED, GRAY ; Slugma
icon_pals RED, PINK ; Magcargo
icon_pals BROWN, GREEN ; Swinub
icon_pals BROWN, GREEN ; Piloswine
icon_pals PINK, TEAL ; Corsola
icon_pals GRAY, PURPLE ; Remoraid
icon_pals RED, BROWN ; Octillery
icon_pals RED, PINK ; Delibird
icon_pals GRAY, BLUE ; Mantine
icon_pals GRAY, BROWN ; Skarmory
icon_pals RED, BLUE ; Houndour
icon_pals RED, BLUE ; Houndoom
icon_pals BLUE, PURPLE ; Kingdra
icon_pals BLUE, TEAL ; Phanpy
icon_pals GRAY, BROWN ; Donphan
icon_pals RED, BLUE ; Porygon2
icon_pals BROWN, GREEN ; Stantler
icon_pals GRAY, BROWN ; Smeargle
icon_pals PINK, BLUE ; Tyrogue
icon_pals BLUE, PURPLE ; Hitmontop
icon_pals PURPLE, PINK ; Smoochum
icon_pals GRAY, BROWN ; Elekid
icon_pals RED, BROWN ; Magby
icon_pals PINK, BLUE ; Miltank
icon_pals PINK, GRAY ; Blissey
icon_pals BROWN, RED ; Raikou
icon_pals RED, BROWN ; Entei
icon_pals TEAL, BLUE ; Suicune
icon_pals GREEN, TEAL ; Larvitar
icon_pals BLUE, PURPLE ; Pupitar
icon_pals GREEN, BROWN ; Tyranitar
icon_pals BLUE, PINK ; Lugia
icon_pals RED, BROWN ; Ho-oh
icon_pals GREEN, PINK ; Celebi
icon_pals RED, RED ; 252
icon_pals RED, BLUE ; Egg
icon_pals RED, RED ; 254
8 changes: 4 additions & 4 deletions data/sprite_anims/framesets.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ SpriteAnimFrameData:
endanim

.Frameset_PartyMon:
frame SPRITE_ANIM_OAMSET_RED_WALK_1, 8
frame SPRITE_ANIM_OAMSET_RED_WALK_2, 8
frame SPRITE_ANIM_OAMSET_PARTY_MON_1, 8
frame SPRITE_ANIM_OAMSET_PARTY_MON_2, 8
dorestart

.Frameset_PartyMonWithMail:
Expand All @@ -87,8 +87,8 @@ SpriteAnimFrameData:
dorestart

.Frameset_PartyMonFast:
frame SPRITE_ANIM_OAMSET_RED_WALK_1, 4
frame SPRITE_ANIM_OAMSET_RED_WALK_2, 4
frame SPRITE_ANIM_OAMSET_PARTY_MON_1, 4
frame SPRITE_ANIM_OAMSET_PARTY_MON_2, 4
dorestart

.Frameset_PartyMonWithMailFast:
Expand Down
41 changes: 25 additions & 16 deletions data/sprite_anims/oam.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ SpriteAnimOAMData:
dbw $08, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9
dbw $04, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10
dbw $00, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11
dbw $00, .OAMData_PartyMon ; SPRITE_ANIM_OAMSET_PARTY_MON_1
dbw $04, .OAMData_PartyMon ; SPRITE_ANIM_OAMSET_PARTY_MON_2

.OAMData_1x1_Palette0:
db 1
Expand Down Expand Up @@ -360,31 +362,38 @@ SpriteAnimOAMData:

.OAMData_PartyMonWithMail1:
db 4
dsprite -1, 0, -1, 0, $00, PAL_OW_RED
dsprite -1, 0, 0, 0, $01, PAL_OW_RED
dsprite 0, 0, -1, 0, $08, PAL_OW_RED
dsprite 0, 0, 0, 0, $03, PAL_OW_RED
dsprite -1, -1, 0, 0, $00, -1
dsprite 0, -1, 0, 0, $01, -1
dsprite -1, 0, 0, 0, $08, PAL_ICON_RED
dsprite 0, 0, 0, 0, $03, -1

.OAMData_PartyMonWithMail2:
db 4
dsprite -1, 0, -1, 0, $04, PAL_OW_RED
dsprite -1, 0, 0, 0, $05, PAL_OW_RED
dsprite 0, 0, -1, 0, $08, PAL_OW_RED
dsprite 0, 0, 0, 0, $07, PAL_OW_RED
dsprite -1, -1, 0, 0, $04, -1
dsprite 0, -1, 0, 0, $05, -1
dsprite -1, 0, 0, 0, $08, PAL_ICON_RED
dsprite 0, 0, 0, 0, $07, -1

.OAMData_PartyMonWithItem1:
db 4
dsprite -1, 0, -1, 0, $00, PAL_OW_RED
dsprite -1, 0, 0, 0, $01, PAL_OW_RED
dsprite 0, 0, -1, 0, $09, PAL_OW_RED
dsprite 0, 0, 0, 0, $03, PAL_OW_RED
dsprite -1, -1, 0, 0, $00, -1
dsprite 0, -1, 0, 0, $01, -1
dsprite -1, 0, 0, 0, $09, PAL_ICON_RED
dsprite 0, 0, 0, 0, $03, -1

.OAMData_PartyMonWithItem2:
db 4
dsprite -1, 0, -1, 0, $04, PAL_OW_RED
dsprite -1, 0, 0, 0, $05, PAL_OW_RED
dsprite 0, 0, -1, 0, $09, PAL_OW_RED
dsprite 0, 0, 0, 0, $07, PAL_OW_RED
dsprite -1, -1, 0, 0, $04, -1
dsprite 0, -1, 0, 0, $05, -1
dsprite -1, 0, 0, 0, $09, PAL_ICON_RED
dsprite 0, 0, 0, 0, $07, -1

.OAMData_PartyMon:
db 4
dsprite -1, -1, 0, 0, $00, -1
dsprite 0, -1, 0, 0, $01, -1
dsprite -1, 0, 0, 0, $02, -1
dsprite 0, 0, 0, 0, $03, -1

.OAMData_GSIntroMagikarp:
db 6
Expand Down
2 changes: 1 addition & 1 deletion engine/gfx/color.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ CGB_ApplyPartyMenuHPPals:
InitPartyMenuOBPals:
ld hl, PartyMenuOBPals
ld de, wOBPals1
ld bc, 2 palettes
ld bc, 8 palettes
ld a, BANK(wOBPals1)
call FarCopyWRAM
ret
Expand Down
Loading

0 comments on commit c26d881

Please sign in to comment.