Skip to content

Commit

Permalink
Port party color code from Prism
Browse files Browse the repository at this point in the history
  • Loading branch information
@roukaour
roukaour committed May 28, 2017
1 parent c718cb4 commit 3d5a91e
Show file tree
Hide file tree
Showing 13 changed files with 485 additions and 152 deletions.
1 change: 0 additions & 1 deletion TODO.md
View file
Expand Up @@ -31,7 +31,6 @@

## Aesthetics

* Colored party Pokémon icons
* Use a side view for Falkner's Pidgeotto in Dark Cave
* Add separate throwing animation graphics for more Poké Ball designs
* Play Pokémon cry+animation when they escape a Poké Ball, and shiny flash when they're caught
Expand Down
7 changes: 7 additions & 0 deletions constants/sprite_constants.asm
View file
Expand Up @@ -291,6 +291,11 @@ NUM_SPRITEHEADER_FIELDS EQU const_value
const PAL_OW_TREE ; 06
const PAL_OW_ROCK ; 07

const_value SET PAL_OW_SILVER
const PAL_OW_GRAY ; $05
const PAL_OW_YELLOW ; $06
const PAL_OW_TEAL ; $07

; sprite movement data table indices
; see data/map_objects.asm
const_def
Expand Down Expand Up @@ -728,3 +733,5 @@ SPRITEMOVEDATA_FIELDS EQU 6
const SPRITE_ANIM_FRAME_IDX_89
const SPRITE_ANIM_FRAME_IDX_8A
const SPRITE_ANIM_FRAME_IDX_8B
const SPRITE_ANIM_FRAME_IDX_8C
const SPRITE_ANIM_FRAME_IDX_8D
253 changes: 253 additions & 0 deletions data/mon_icon_pals.asm
View file
@@ -0,0 +1,253 @@
dn PAL_OW_TEAL, PAL_OW_YELLOW ; BULBASAUR
dn PAL_OW_TEAL, PAL_OW_YELLOW ; IVYSAUR
dn PAL_OW_TEAL, PAL_OW_YELLOW ; VENUSAUR
dn PAL_OW_RED, PAL_OW_YELLOW ; CHARMANDER
dn PAL_OW_RED, PAL_OW_YELLOW ; CHARMELEON
dn PAL_OW_RED, PAL_OW_GRAY ; CHARIZARD
dn PAL_OW_BLUE, PAL_OW_TEAL ; SQUIRTLE
dn PAL_OW_BLUE, PAL_OW_TEAL ; WARTORTLE
dn PAL_OW_BLUE, PAL_OW_TEAL ; BLASTOISE
dn PAL_OW_GREEN, PAL_OW_YELLOW ; CATERPIE
dn PAL_OW_GREEN, PAL_OW_RED ; METAPOD
dn PAL_OW_BLUE, PAL_OW_RED ; BUTTERFREE
dn PAL_OW_BROWN, PAL_OW_YELLOW ; WEEDLE
dn PAL_OW_YELLOW, PAL_OW_GREEN ; KAKUNA
dn PAL_OW_YELLOW, PAL_OW_TEAL ; BEEDRILL
dn PAL_OW_BROWN, PAL_OW_YELLOW ; PIDGEY
dn PAL_OW_BROWN, PAL_OW_YELLOW ; PIDGEOTTO
dn PAL_OW_BROWN, PAL_OW_YELLOW ; PIDGEOT
dn PAL_OW_PURPLE, PAL_OW_YELLOW ; RATTATA
dn PAL_OW_BROWN, PAL_OW_RED ; RATICATE
dn PAL_OW_BLUE, PAL_OW_GREEN ; MARILL
dn PAL_OW_BLUE, PAL_OW_YELLOW ; AZUMARILL
dn PAL_OW_PURPLE, PAL_OW_BROWN ; EKANS
dn PAL_OW_PURPLE, PAL_OW_BROWN ; ARBOK
dn PAL_OW_YELLOW, PAL_OW_YELLOW ; PIKACHU
dn PAL_OW_RED, PAL_OW_RED ; RAICHU
dn PAL_OW_BROWN, PAL_OW_TEAL ; SANDSHREW
dn PAL_OW_BROWN, PAL_OW_RED ; SANDSLASH
dn PAL_OW_TEAL, PAL_OW_PURPLE ; NIDORAN_F
dn PAL_OW_TEAL, PAL_OW_PURPLE ; NIDORINA
dn PAL_OW_TEAL, PAL_OW_PURPLE ; NIDOQUEEN
dn PAL_OW_PURPLE, PAL_OW_TEAL ; NIDORAN_M
dn PAL_OW_PURPLE, PAL_OW_TEAL ; NIDORINO
dn PAL_OW_PURPLE, PAL_OW_TEAL ; NIDOKING
dn PAL_OW_RED, PAL_OW_RED ; CLEFAIRY
dn PAL_OW_RED, PAL_OW_RED ; CLEFABLE
dn PAL_OW_RED, PAL_OW_YELLOW ; VULPIX
dn PAL_OW_YELLOW, PAL_OW_GRAY ; NINETALES
dn PAL_OW_RED, PAL_OW_RED ; JIGGLYPUFF
dn PAL_OW_RED, PAL_OW_RED ; WIGGLYTUFF
dn PAL_OW_BLUE, PAL_OW_GREEN ; ZUBAT
dn PAL_OW_BLUE, PAL_OW_GREEN ; GOLBAT
dn PAL_OW_BLUE, PAL_OW_GREEN ; ODDISH
dn PAL_OW_BLUE, PAL_OW_GREEN ; GLOOM
dn PAL_OW_RED, PAL_OW_GREEN ; VILEPLUME
dn PAL_OW_RED, PAL_OW_YELLOW ; PARAS
dn PAL_OW_RED, PAL_OW_YELLOW ; PARASECT
dn PAL_OW_PURPLE, PAL_OW_BLUE ; VENONAT
dn PAL_OW_PURPLE, PAL_OW_BLUE ; VENOMOTH
dn PAL_OW_BROWN, PAL_OW_GRAY ; DIGLETT
dn PAL_OW_BROWN, PAL_OW_GRAY ; DUGTRIO
dn PAL_OW_BROWN, PAL_OW_RED ; MEOWTH
dn PAL_OW_BROWN, PAL_OW_RED ; PERSIAN
dn PAL_OW_BROWN, PAL_OW_BLUE ; PSYDUCK
dn PAL_OW_BLUE, PAL_OW_BLUE ; GOLDUCK
dn PAL_OW_BROWN, PAL_OW_YELLOW ; MANKEY
dn PAL_OW_BROWN, PAL_OW_YELLOW ; PRIMEAPE
dn PAL_OW_RED, PAL_OW_BLUE ; GROWLITHE
dn PAL_OW_RED, PAL_OW_BLUE ; ARCANINE
dn PAL_OW_BLUE, PAL_OW_BLUE ; POLIWAG
dn PAL_OW_BLUE, PAL_OW_BLUE ; POLIWHIRL
dn PAL_OW_BLUE, PAL_OW_TEAL ; POLIWRATH
dn PAL_OW_BROWN, PAL_OW_RED ; ABRA
dn PAL_OW_BROWN, PAL_OW_RED ; KADABRA
dn PAL_OW_BROWN, PAL_OW_RED ; ALAKAZAM
dn PAL_OW_GRAY, PAL_OW_GREEN ; MACHOP
dn PAL_OW_GRAY, PAL_OW_GREEN ; MACHOKE
dn PAL_OW_GRAY, PAL_OW_GREEN ; MACHAMP
dn PAL_OW_GREEN, PAL_OW_YELLOW ; BELLSPROUT
dn PAL_OW_GREEN, PAL_OW_GREEN ; WEEPINBELL
dn PAL_OW_GREEN, PAL_OW_GREEN ; VICTREEBEL
dn PAL_OW_BLUE, PAL_OW_BLUE ; TENTACOOL
dn PAL_OW_BLUE, PAL_OW_BLUE ; TENTACRUEL
dn PAL_OW_BROWN, PAL_OW_RED ; GEODUDE
dn PAL_OW_BROWN, PAL_OW_RED ; GRAVELER
dn PAL_OW_BROWN, PAL_OW_RED ; GOLEM
dn PAL_OW_RED, PAL_OW_BLUE ; PONYTA
dn PAL_OW_RED, PAL_OW_BLUE ; RAPIDASH
dn PAL_OW_RED, PAL_OW_PURPLE ; SLOWPOKE
dn PAL_OW_RED, PAL_OW_PURPLE ; SLOWBRO
dn PAL_OW_GRAY, PAL_OW_GRAY ; MAGNEMITE
dn PAL_OW_GRAY, PAL_OW_GRAY ; MAGNETON
dn PAL_OW_BROWN, PAL_OW_BROWN ; FARFETCH_D
dn PAL_OW_BROWN, PAL_OW_YELLOW ; DODUO
dn PAL_OW_BROWN, PAL_OW_YELLOW ; DODRIO
dn PAL_OW_BLUE, PAL_OW_BLUE ; SEEL
dn PAL_OW_BLUE, PAL_OW_BLUE ; DEWGONG
dn PAL_OW_PURPLE, PAL_OW_GREEN ; GRIMER
dn PAL_OW_PURPLE, PAL_OW_GREEN ; MUK
dn PAL_OW_PURPLE, PAL_OW_RED ; SHELLDER
dn PAL_OW_PURPLE, PAL_OW_PURPLE ; CLOYSTER
dn PAL_OW_PURPLE, PAL_OW_BLUE ; GASTLY
dn PAL_OW_PURPLE, PAL_OW_BLUE ; HAUNTER
dn PAL_OW_PURPLE, PAL_OW_BLUE ; GENGAR
dn PAL_OW_GRAY, PAL_OW_BLUE ; ONIX
dn PAL_OW_YELLOW, PAL_OW_PURPLE ; DROWZEE
dn PAL_OW_YELLOW, PAL_OW_PURPLE ; HYPNO
dn PAL_OW_RED, PAL_OW_BLUE ; KRABBY
dn PAL_OW_RED, PAL_OW_BLUE ; KINGLER
dn PAL_OW_RED, PAL_OW_BLUE ; VOLTORB
dn PAL_OW_RED, PAL_OW_BLUE ; ELECTRODE
dn PAL_OW_RED, PAL_OW_TEAL ; EXEGGCUTE
dn PAL_OW_BROWN, PAL_OW_TEAL ; EXEGGUTOR
dn PAL_OW_BROWN, PAL_OW_TEAL ; CUBONE
dn PAL_OW_BROWN, PAL_OW_TEAL ; MAROWAK
dn PAL_OW_BROWN, PAL_OW_YELLOW ; HITMONLEE
dn PAL_OW_BROWN, PAL_OW_BLUE ; HITMONCHAN
dn PAL_OW_PURPLE, PAL_OW_BLUE ; KOFFING
dn PAL_OW_PURPLE, PAL_OW_BLUE ; WEEZING
dn PAL_OW_GRAY, PAL_OW_RED ; RHYHORN
dn PAL_OW_GRAY, PAL_OW_RED ; RHYDON
dn PAL_OW_RED, PAL_OW_YELLOW ; CHANSEY
dn PAL_OW_BLUE, PAL_OW_GREEN ; TANGELA
dn PAL_OW_BROWN, PAL_OW_GRAY ; KANGASKHAN
dn PAL_OW_BLUE, PAL_OW_BLUE ; HORSEA
dn PAL_OW_BLUE, PAL_OW_BLUE ; SEADRA
dn PAL_OW_RED, PAL_OW_YELLOW ; TOGEPI
dn PAL_OW_RED, PAL_OW_YELLOW ; TOGETIC
dn PAL_OW_RED, PAL_OW_YELLOW ; TOGEKISS
dn PAL_OW_BROWN, PAL_OW_BLUE ; STARYU
dn PAL_OW_PURPLE, PAL_OW_BLUE ; STARMIE
dn PAL_OW_PURPLE, PAL_OW_RED ; MR__MIME
dn PAL_OW_GREEN, PAL_OW_RED ; SCYTHER
dn PAL_OW_PURPLE, PAL_OW_RED ; JYNX
dn PAL_OW_YELLOW, PAL_OW_RED ; ELECTABUZZ
dn PAL_OW_RED, PAL_OW_YELLOW ; MAGMAR
dn PAL_OW_BROWN, PAL_OW_BLUE ; PINSIR
dn PAL_OW_BROWN, PAL_OW_RED ; TAUROS
dn PAL_OW_RED, PAL_OW_YELLOW ; MAGIKARP
dn PAL_OW_BLUE, PAL_OW_RED ; GYARADOS
dn PAL_OW_BLUE, PAL_OW_RED ; LAPRAS
dn PAL_OW_PURPLE, PAL_OW_BLUE ; DITTO
dn PAL_OW_BROWN, PAL_OW_GRAY ; EEVEE
dn PAL_OW_BLUE, PAL_OW_PURPLE ; VAPOREON
dn PAL_OW_YELLOW, PAL_OW_YELLOW ; JOLTEON
dn PAL_OW_RED, PAL_OW_BLUE ; FLAREON
dn PAL_OW_BLUE, PAL_OW_PURPLE ; PORYGON
dn PAL_OW_BLUE, PAL_OW_GRAY ; OMANYTE
dn PAL_OW_BLUE, PAL_OW_GRAY ; OMASTAR
dn PAL_OW_BROWN, PAL_OW_GRAY ; KABUTO
dn PAL_OW_BROWN, PAL_OW_GRAY ; KABUTOPS
dn PAL_OW_BROWN, PAL_OW_GRAY ; AERODACTYL
dn PAL_OW_BLUE, PAL_OW_BLUE ; SNORLAX
dn PAL_OW_BLUE, PAL_OW_BLUE ; ARTICUNO
dn PAL_OW_YELLOW, PAL_OW_YELLOW ; ZAPDOS
dn PAL_OW_RED, PAL_OW_RED ; MOLTRES
dn PAL_OW_BLUE, PAL_OW_BLUE ; DRATINI
dn PAL_OW_BLUE, PAL_OW_BLUE ; DRAGONAIR
dn PAL_OW_RED, PAL_OW_BLUE ; DRAGONITE
dn PAL_OW_PURPLE, PAL_OW_GRAY ; MEWTWO
dn PAL_OW_RED, PAL_OW_BLUE ; MEW
dn PAL_OW_GREEN, PAL_OW_RED ; CHIKORITA
dn PAL_OW_GREEN, PAL_OW_RED ; BAYLEEF
dn PAL_OW_GREEN, PAL_OW_RED ; MEGANIUM
dn PAL_OW_RED, PAL_OW_RED ; CYNDAQUIL
dn PAL_OW_RED, PAL_OW_RED ; QUILAVA
dn PAL_OW_RED, PAL_OW_RED ; TYPHLOSION
dn PAL_OW_BLUE, PAL_OW_TEAL ; TOTODILE
dn PAL_OW_BLUE, PAL_OW_TEAL ; CROCONAW
dn PAL_OW_BLUE, PAL_OW_TEAL ; FERALIGATR
dn PAL_OW_BROWN, PAL_OW_YELLOW ; SENTRET
dn PAL_OW_BROWN, PAL_OW_RED ; FURRET
dn PAL_OW_BROWN, PAL_OW_YELLOW ; HOOTHOOT
dn PAL_OW_BROWN, PAL_OW_YELLOW ; NOCTOWL
dn PAL_OW_RED, PAL_OW_YELLOW ; LEDYBA
dn PAL_OW_RED, PAL_OW_YELLOW ; LEDIAN
dn PAL_OW_GREEN, PAL_OW_PURPLE ; SPINARAK
dn PAL_OW_PURPLE, PAL_OW_PURPLE ; ARIADOS
dn PAL_OW_PURPLE, PAL_OW_RED ; CROBAT
dn PAL_OW_BLUE, PAL_OW_TEAL ; CHINCHOU
dn PAL_OW_BLUE, PAL_OW_TEAL ; LANTURN
dn PAL_OW_YELLOW, PAL_OW_RED ; PICHU
dn PAL_OW_BLUE, PAL_OW_BLUE ; MUNCHLAX
dn PAL_OW_GRAY, PAL_OW_GRAY ; MAGNEZONE
dn PAL_OW_BLUE, PAL_OW_GREEN ; TANGROWTH
dn PAL_OW_GREEN, PAL_OW_GREEN ; NATU
dn PAL_OW_GREEN, PAL_OW_GREEN ; XATU
dn PAL_OW_YELLOW, PAL_OW_RED ; MAREEP
dn PAL_OW_RED, PAL_OW_RED ; FLAAFFY
dn PAL_OW_YELLOW, PAL_OW_RED ; AMPHAROS
dn PAL_OW_GREEN, PAL_OW_RED ; BELLOSSOM
dn PAL_OW_GRAY, PAL_OW_GRAY ; RHYPERIOR
dn PAL_OW_BROWN, PAL_OW_GREEN ; SUDOWOODO
dn PAL_OW_GREEN, PAL_OW_TEAL ; POLITOED
dn PAL_OW_GREEN, PAL_OW_YELLOW ; SUNKERN
dn PAL_OW_GREEN, PAL_OW_YELLOW ; SUNFLORA
dn PAL_OW_RED, PAL_OW_BLUE ; YANMA
dn PAL_OW_RED, PAL_OW_BLUE ; YANMEGA
dn PAL_OW_BLUE, PAL_OW_RED ; WOOPER
dn PAL_OW_BLUE, PAL_OW_RED ; QUAGSIRE
dn PAL_OW_PURPLE, PAL_OW_GREEN ; ESPEON
dn PAL_OW_YELLOW, PAL_OW_GREEN ; UMBREON
dn PAL_OW_GREEN, PAL_OW_GREEN ; LEAFEON
dn PAL_OW_BLUE, PAL_OW_BLUE ; GLACEON
dn PAL_OW_BLUE, PAL_OW_PURPLE ; MURKROW
dn PAL_OW_BLUE, PAL_OW_PURPLE ; HONCHKROW
dn PAL_OW_RED, PAL_OW_PURPLE ; SLOWKING
dn PAL_OW_PURPLE, PAL_OW_BROWN ; MISDREAVUS
dn PAL_OW_PURPLE, PAL_OW_BROWN ; MISMAGIUS
dn PAL_OW_GRAY, PAL_OW_BLUE ; UNOWN
dn PAL_OW_BLUE, PAL_OW_PURPLE ; WOBBUFFET
dn PAL_OW_BROWN, PAL_OW_BLUE ; GIRAFARIG
dn PAL_OW_GRAY, PAL_OW_RED ; PINECO
dn PAL_OW_PURPLE, PAL_OW_BROWN ; FORRETRESS
dn PAL_OW_BLUE, PAL_OW_RED ; DUNSPARCE
dn PAL_OW_PURPLE, PAL_OW_GRAY ; GLIGAR
dn PAL_OW_PURPLE, PAL_OW_GRAY ; GLISCOR
dn PAL_OW_GRAY, PAL_OW_YELLOW ; STEELIX
dn PAL_OW_RED, PAL_OW_BLUE ; SNUBBULL
dn PAL_OW_PURPLE, PAL_OW_GRAY ; GRANBULL
dn PAL_OW_BLUE, PAL_OW_BLUE ; QWILFISH
dn PAL_OW_RED, PAL_OW_GRAY ; SCIZOR
dn PAL_OW_BLUE, PAL_OW_PURPLE ; HERACROSS
dn PAL_OW_BLUE, PAL_OW_RED ; SNEASEL
dn PAL_OW_BLUE, PAL_OW_RED ; WEAVILE
dn PAL_OW_BROWN, PAL_OW_GREEN ; TEDDIURSA
dn PAL_OW_BROWN, PAL_OW_GREEN ; URSARING
dn PAL_OW_RED, PAL_OW_GRAY ; SLUGMA
dn PAL_OW_RED, PAL_OW_BLUE ; MAGCARGO
dn PAL_OW_BROWN, PAL_OW_BLUE ; SWINUB
dn PAL_OW_BROWN, PAL_OW_YELLOW ; PILOSWINE
dn PAL_OW_BROWN, PAL_OW_YELLOW ; MAMOSWINE
dn PAL_OW_RED, PAL_OW_BLUE ; CORSOLA
dn PAL_OW_BLUE, PAL_OW_GRAY ; REMORAID
dn PAL_OW_RED, PAL_OW_TEAL ; OCTILLERY
dn PAL_OW_BLUE, PAL_OW_BLUE ; MANTINE
dn PAL_OW_GRAY, PAL_OW_GREEN ; SKARMORY
dn PAL_OW_RED, PAL_OW_GRAY ; HOUNDOUR
dn PAL_OW_RED, PAL_OW_GRAY ; HOUNDOOM
dn PAL_OW_BLUE, PAL_OW_PURPLE ; KINGDRA
dn PAL_OW_BLUE, PAL_OW_BLUE ; PHANPY
dn PAL_OW_GRAY, PAL_OW_RED ; DONPHAN
dn PAL_OW_BLUE, PAL_OW_BLUE ; PORYGON2
dn PAL_OW_BROWN, PAL_OW_GREEN ; SMEARGLE
dn PAL_OW_BROWN, PAL_OW_BLUE ; TYROGUE
dn PAL_OW_BROWN, PAL_OW_BLUE ; HITMONTOP
dn PAL_OW_YELLOW, PAL_OW_RED ; ELEKID
dn PAL_OW_YELLOW, PAL_OW_RED ; ELECTIVIRE
dn PAL_OW_RED, PAL_OW_YELLOW ; MAGBY
dn PAL_OW_RED, PAL_OW_YELLOW ; MAGMORTAR
dn PAL_OW_RED, PAL_OW_BLUE ; MILTANK
dn PAL_OW_RED, PAL_OW_RED ; BLISSEY
dn PAL_OW_YELLOW, PAL_OW_RED ; RAIKOU
dn PAL_OW_RED, PAL_OW_BROWN ; ENTEI
dn PAL_OW_BLUE, PAL_OW_BLUE ; SUICUNE
dn PAL_OW_GREEN, PAL_OW_GREEN ; LARVITAR
dn PAL_OW_GRAY, PAL_OW_PURPLE ; PUPITAR
dn PAL_OW_GREEN, PAL_OW_GRAY ; TYRANITAR
dn PAL_OW_BLUE, PAL_OW_BLUE ; LUGIA
dn PAL_OW_RED, PAL_OW_YELLOW ; HO_OH
dn PAL_OW_GREEN, PAL_OW_RED ; CELEBI
dn PAL_OW_RED, PAL_OW_BLUE ; SYLVEON
dn PAL_OW_BLUE, PAL_OW_BLUE ; PORYGON_Z
38 changes: 23 additions & 15 deletions data/sprite_engine.asm
View file
Expand Up @@ -457,8 +457,8 @@ SpriteAnimFrameData: ; 8d6e6

SpriteAnimOAMData: ; 8d94d
; vtile offset, pointer
dbw $00, .OAMData_00 ; SPRITE_ANIM_FRAME_IDX_00
dbw $04, .OAMData_00 ; SPRITE_ANIM_FRAME_IDX_01
dbw $00, .OAMData_85 ; SPRITE_ANIM_FRAME_IDX_00
dbw $04, .OAMData_85 ; SPRITE_ANIM_FRAME_IDX_01
dbw $4c, .OAMData_02 ; SPRITE_ANIM_FRAME_IDX_02
dbw $5c, .OAMData_02 ; SPRITE_ANIM_FRAME_IDX_03
dbw $6c, .OAMData_04 ; SPRITE_ANIM_FRAME_IDX_04
Expand Down Expand Up @@ -803,13 +803,21 @@ SpriteAnimOAMData: ; 8d94d
dsprite 2, 0, 2, 0, $23, $00

.OAMData_00:
; party menu icons
; former party menu icons
db 4
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $01, $00
dsprite 0, 0, -1, 0, $02, $00
dsprite 0, 0, 0, 0, $03, $00

.OAMData_85:
; new party menu icons
db 4
dsprite -1, 0, -1, 0, $00, -1
dsprite -1, 0, 0, 0, $01, -1
dsprite 0, 0, -1, 0, $02, -1
dsprite 0, 0, 0, 0, $03, -1

.OAMData_31:
db 4
dsprite -1, 0, -1, 0, $00, $80
Expand All @@ -820,34 +828,34 @@ SpriteAnimOAMData: ; 8d94d
.OAMData_3d:
; party menu icon with mail, frame 1
db 4
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $01, $00
dsprite -1, 0, -1, 0, $00, -1
dsprite -1, 0, 0, 0, $01, -1
dsprite 0, 0, -1, 0, $08, $00
dsprite 0, 0, 0, 0, $03, $00
dsprite 0, 0, 0, 0, $03, -1

.OAMData_3e:
; party menu icon with mail, frame 2
db 4
dsprite -1, 0, -1, 0, $04, $00
dsprite -1, 0, 0, 0, $05, $00
dsprite -1, 0, -1, 0, $04, -1
dsprite -1, 0, 0, 0, $05, -1
dsprite 0, 0, -1, 0, $08, $00
dsprite 0, 0, 0, 0, $07, $00
dsprite 0, 0, 0, 0, $07, -1

.OAMData_3f:
; party menu icon with item, frame 1
db 4
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $01, $00
dsprite -1, 0, -1, 0, $00, -1
dsprite -1, 0, 0, 0, $01, -1
dsprite 0, 0, -1, 0, $09, $00
dsprite 0, 0, 0, 0, $03, $00
dsprite 0, 0, 0, 0, $03, -1

.OAMData_40:
; party menu icon with item, frame 2
db 4
dsprite -1, 0, -1, 0, $04, $00
dsprite -1, 0, 0, 0, $05, $00
dsprite -1, 0, -1, 0, $04, -1
dsprite -1, 0, 0, 0, $05, -1
dsprite 0, 0, -1, 0, $09, $00
dsprite 0, 0, 0, 0, $07, $00
dsprite 0, 0, 0, 0, $07, -1

.OAMData_06:
db 6
Expand Down
2 changes: 0 additions & 2 deletions engine/color.asm
View file
Expand Up @@ -5,11 +5,9 @@ INCLUDE "engine/cgb.asm"
CheckShininess:
; Check if a mon is shiny by personality at bc.
; Return carry if shiny.

ld a, [bc]
and SHINY_MASK
jr z, .NotShiny

scf
ret

Expand Down

0 comments on commit 3d5a91e

Please sign in to comment.