Merge pull request #101 from Sanky/master

Menu icons.

constants.asm

@@ -617,6 +617,46 @@ LADIES_MAN    EQU $0D
 REPTILE       EQU $0E
 NO_EGGS       EQU $0F
 
+; menu sprites
+ICON_POLIWAG       EQU $01
+ICON_JIGGLYPUFF    EQU $02
+ICON_DIGLETT       EQU $03
+ICON_PIKACHU       EQU $04
+ICON_STARYU        EQU $05
+ICON_FISH          EQU $06
+ICON_BIRD          EQU $07
+ICON_MONSTER       EQU $08
+ICON_CLEFAIRY      EQU $09
+ICON_ODDISH        EQU $0a
+ICON_BUG           EQU $0b
+ICON_GHOST         EQU $0c
+ICON_LAPRAS        EQU $0d
+ICON_HUMANSHAPE    EQU $0e
+ICON_FOX           EQU $0f
+ICON_EQUINE        EQU $10
+ICON_SHELL         EQU $11
+ICON_BLOB          EQU $12
+ICON_SERPENT       EQU $13
+ICON_VOLTORB       EQU $14
+ICON_SQUIRTLE      EQU $15
+ICON_BULBASAUR     EQU $16
+ICON_CHARMANDER    EQU $17
+ICON_CATERPILLAR   EQU $18
+ICON_UNOWN         EQU $19
+ICON_GEODUDE       EQU $1a
+ICON_FIGHTER       EQU $1b
+ICON_EGG           EQU $1c
+ICON_JELLYFISH     EQU $1d
+ICON_MOTH          EQU $1e
+ICON_BAT           EQU $1f
+ICON_SNORLAX       EQU $20
+ICON_HO_OH         EQU $21
+ICON_LUGIA         EQU $22
+ICON_GYARADOS      EQU $23
+ICON_SLOWPOKE      EQU $24
+ICON_SUDOWOODO     EQU $25
+ICON_BIGMON        EQU $26
+
 ; map group ids
 GROUP_OLIVINE_POKECENTER_1F EQU $01
 GROUP_OLIVINE_GYM EQU $01

gfx/icon/slowpoke.2bpp

@@ -0,0 +1,2 @@
+88GP|c<+<#@O88ִ<38><14>|<7C>x¨xˆ<78><04>ה?  ? ?רננרר<04><04>ˆרpp#?(?>1? ?'ג‏
+‏>ֶ<װ<ִ‏‏ע ? ?<0C>רררר<04><04>ˆרpp

main.asm

@@ -65980,8 +65980,319 @@ GetTimePalFade: ; 8c17c
 	db %00000000
 ; 8c20f
 
-INCBIN "baserom.gbc",$8c20f,$8ff0d - $8c20f
+INCBIN "baserom.gbc",$8c20f,$8eab3 - $8c20f
 
+ReadMonMenuIcon: ; 8eab3
+	cp EGG
+	jr z, .egg
+	dec a
+	ld hl, MonMenuIcons
+	ld e, a
+	ld d, $0
+	add hl, de
+	ld a, [hl]
+	ret
+.egg
+	ld a, ICON_EGG
+	ret
+; 0x8eac4
+
+MonMenuIcons: ; 8eac4
+	db ICON_BULBASAUR    ; BULBASAUR
+	db ICON_BULBASAUR    ; IVYSAUR
+	db ICON_BULBASAUR    ; VENUSAUR
+	db ICON_CHARMANDER   ; CHARMANDER
+	db ICON_CHARMANDER   ; CHARMELEON
+	db ICON_BIGMON       ; CHARIZARD
+	db ICON_SQUIRTLE     ; SQUIRTLE
+	db ICON_SQUIRTLE     ; WARTORTLE
+	db ICON_SQUIRTLE     ; BLASTOISE
+	db ICON_CATERPILLAR  ; CATERPIE
+	db ICON_CATERPILLAR  ; METAPOD
+	db ICON_MOTH         ; BUTTERFREE
+	db ICON_CATERPILLAR  ; WEEDLE
+	db ICON_CATERPILLAR  ; KAKUNA
+	db ICON_BUG          ; BEEDRILL
+	db ICON_BIRD         ; PIDGEY
+	db ICON_BIRD         ; PIDGEOTTO
+	db ICON_BIRD         ; PIDGEOT
+	db ICON_FOX          ; RATTATA
+	db ICON_FOX          ; RATICATE
+	db ICON_BIRD         ; SPEAROW
+	db ICON_BIRD         ; FEAROW
+	db ICON_SERPENT      ; EKANS
+	db ICON_SERPENT      ; ARBOK
+	db ICON_PIKACHU      ; PIKACHU
+	db ICON_PIKACHU      ; RAICHU
+	db ICON_MONSTER      ; SANDSHREW
+	db ICON_MONSTER      ; SANDSLASH
+	db ICON_FOX          ; NIDORAN_F
+	db ICON_FOX          ; NIDORINA
+	db ICON_MONSTER      ; NIDOQUEEN
+	db ICON_FOX          ; NIDORAN_M
+	db ICON_FOX          ; NIDORINO
+	db ICON_MONSTER      ; NIDOKING
+	db ICON_CLEFAIRY     ; CLEFAIRY
+	db ICON_CLEFAIRY     ; CLEFABLE
+	db ICON_FOX          ; VULPIX
+	db ICON_FOX          ; NINETALES
+	db ICON_JIGGLYPUFF   ; JIGGLYPUFF
+	db ICON_JIGGLYPUFF   ; WIGGLYTUFF
+	db ICON_BAT          ; ZUBAT
+	db ICON_BAT          ; GOLBAT
+	db ICON_ODDISH       ; ODDISH
+	db ICON_ODDISH       ; GLOOM
+	db ICON_ODDISH       ; VILEPLUME
+	db ICON_BUG          ; PARAS
+	db ICON_BUG          ; PARASECT
+	db ICON_CATERPILLAR  ; VENONAT
+	db ICON_MOTH         ; VENOMOTH
+	db ICON_DIGLETT      ; DIGLETT
+	db ICON_DIGLETT      ; DUGTRIO
+	db ICON_FOX          ; MEOWTH
+	db ICON_FOX          ; PERSIAN
+	db ICON_MONSTER      ; PSYDUCK
+	db ICON_MONSTER      ; GOLDUCK
+	db ICON_FIGHTER      ; MANKEY
+	db ICON_FIGHTER      ; PRIMEAPE
+	db ICON_FOX          ; GROWLITHE
+	db ICON_FOX          ; ARCANINE
+	db ICON_POLIWAG      ; POLIWAG
+	db ICON_POLIWAG      ; POLIWHIRL
+	db ICON_POLIWAG      ; POLIWRATH
+	db ICON_HUMANSHAPE   ; ABRA
+	db ICON_HUMANSHAPE   ; KADABRA
+	db ICON_HUMANSHAPE   ; ALAKAZAM
+	db ICON_FIGHTER      ; MACHOP
+	db ICON_FIGHTER      ; MACHOKE
+	db ICON_FIGHTER      ; MACHAMP
+	db ICON_ODDISH       ; BELLSPROUT
+	db ICON_ODDISH       ; WEEPINBELL
+	db ICON_ODDISH       ; VICTREEBEL
+	db ICON_JELLYFISH    ; TENTACOOL
+	db ICON_JELLYFISH    ; TENTACRUEL
+	db ICON_GEODUDE      ; GEODUDE
+	db ICON_GEODUDE      ; GRAVELER
+	db ICON_GEODUDE      ; GOLEM
+	db ICON_EQUINE       ; PONYTA
+	db ICON_EQUINE       ; RAPIDASH
+	db ICON_SLOWPOKE     ; SLOWPOKE
+	db ICON_SLOWPOKE     ; SLOWBRO
+	db ICON_VOLTORB      ; MAGNEMITE
+	db ICON_VOLTORB      ; MAGNETON
+	db ICON_BIRD         ; FARFETCH_D
+	db ICON_BIRD         ; DODUO
+	db ICON_BIRD         ; DODRIO
+	db ICON_LAPRAS       ; SEEL
+	db ICON_LAPRAS       ; DEWGONG
+	db ICON_BLOB         ; GRIMER
+	db ICON_BLOB         ; MUK
+	db ICON_SHELL        ; SHELLDER
+	db ICON_SHELL        ; CLOYSTER
+	db ICON_GHOST        ; GASTLY
+	db ICON_GHOST        ; HAUNTER
+	db ICON_GHOST        ; GENGAR
+	db ICON_SERPENT      ; ONIX
+	db ICON_HUMANSHAPE   ; DROWZEE
+	db ICON_HUMANSHAPE   ; HYPNO
+	db ICON_SHELL        ; KRABBY
+	db ICON_SHELL        ; KINGLER
+	db ICON_VOLTORB      ; VOLTORB
+	db ICON_VOLTORB      ; ELECTRODE
+	db ICON_ODDISH       ; EXEGGCUTE
+	db ICON_ODDISH       ; EXEGGUTOR
+	db ICON_MONSTER      ; CUBONE
+	db ICON_MONSTER      ; MAROWAK
+	db ICON_FIGHTER      ; HITMONLEE
+	db ICON_FIGHTER      ; HITMONCHAN
+	db ICON_MONSTER      ; LICKITUNG
+	db ICON_BLOB         ; KOFFING
+	db ICON_BLOB         ; WEEZING
+	db ICON_EQUINE       ; RHYHORN
+	db ICON_MONSTER      ; RHYDON
+	db ICON_CLEFAIRY     ; CHANSEY
+	db ICON_ODDISH       ; TANGELA
+	db ICON_MONSTER      ; KANGASKHAN
+	db ICON_FISH         ; HORSEA
+	db ICON_FISH         ; SEADRA
+	db ICON_FISH         ; GOLDEEN
+	db ICON_FISH         ; SEAKING
+	db ICON_STARYU       ; STARYU
+	db ICON_STARYU       ; STARMIE
+	db ICON_HUMANSHAPE   ; MR__MIME
+	db ICON_BUG          ; SCYTHER
+	db ICON_HUMANSHAPE   ; JYNX
+	db ICON_HUMANSHAPE   ; ELECTABUZZ
+	db ICON_HUMANSHAPE   ; MAGMAR
+	db ICON_BUG          ; PINSIR
+	db ICON_EQUINE       ; TAUROS
+	db ICON_FISH         ; MAGIKARP
+	db ICON_GYARADOS     ; GYARADOS
+	db ICON_LAPRAS       ; LAPRAS
+	db ICON_BLOB         ; DITTO
+	db ICON_FOX          ; EEVEE
+	db ICON_FOX          ; VAPOREON
+	db ICON_FOX          ; JOLTEON
+	db ICON_FOX          ; FLAREON
+	db ICON_VOLTORB      ; PORYGON
+	db ICON_SHELL        ; OMANYTE
+	db ICON_SHELL        ; OMASTAR
+	db ICON_SHELL        ; KABUTO
+	db ICON_SHELL        ; KABUTOPS
+	db ICON_BIRD         ; AERODACTYL
+	db ICON_SNORLAX      ; SNORLAX
+	db ICON_BIRD         ; ARTICUNO
+	db ICON_BIRD         ; ZAPDOS
+	db ICON_BIRD         ; MOLTRES
+	db ICON_SERPENT      ; DRATINI
+	db ICON_SERPENT      ; DRAGONAIR
+	db ICON_BIGMON       ; DRAGONITE
+	db ICON_HUMANSHAPE   ; MEWTWO
+	db ICON_HUMANSHAPE   ; MEW
+	db ICON_ODDISH       ; CHIKORITA
+	db ICON_ODDISH       ; BAYLEEF
+	db ICON_ODDISH       ; MEGANIUM
+	db ICON_FOX          ; CYNDAQUIL
+	db ICON_FOX          ; QUILAVA
+	db ICON_FOX          ; TYPHLOSION
+	db ICON_MONSTER      ; TOTODILE
+	db ICON_MONSTER      ; CROCONAW
+	db ICON_MONSTER      ; FERALIGATR
+	db ICON_FOX          ; SENTRET
+	db ICON_FOX          ; FURRET
+	db ICON_BIRD         ; HOOTHOOT
+	db ICON_BIRD         ; NOCTOWL
+	db ICON_BUG          ; LEDYBA
+	db ICON_BUG          ; LEDIAN
+	db ICON_BUG          ; SPINARAK
+	db ICON_BUG          ; ARIADOS
+	db ICON_BAT          ; CROBAT
+	db ICON_FISH         ; CHINCHOU
+	db ICON_FISH         ; LANTURN
+	db ICON_PIKACHU      ; PICHU
+	db ICON_CLEFAIRY     ; CLEFFA
+	db ICON_JIGGLYPUFF   ; IGGLYBUFF
+	db ICON_CLEFAIRY     ; TOGEPI
+	db ICON_BIRD         ; TOGETIC
+	db ICON_BIRD         ; NATU
+	db ICON_BIRD         ; XATU
+	db ICON_FOX          ; MAREEP
+	db ICON_MONSTER      ; FLAAFFY
+	db ICON_MONSTER      ; AMPHAROS
+	db ICON_ODDISH       ; BELLOSSOM
+	db ICON_JIGGLYPUFF   ; MARILL
+	db ICON_JIGGLYPUFF   ; AZUMARILL
+	db ICON_SUDOWOODO    ; SUDOWOODO
+	db ICON_POLIWAG      ; POLITOED
+	db ICON_ODDISH       ; HOPPIP
+	db ICON_ODDISH       ; SKIPLOOM
+	db ICON_ODDISH       ; JUMPLUFF
+	db ICON_MONSTER      ; AIPOM
+	db ICON_ODDISH       ; SUNKERN
+	db ICON_ODDISH       ; SUNFLORA
+	db ICON_BUG          ; YANMA
+	db ICON_MONSTER      ; WOOPER
+	db ICON_MONSTER      ; QUAGSIRE
+	db ICON_FOX          ; ESPEON
+	db ICON_FOX          ; UMBREON
+	db ICON_BIRD         ; MURKROW
+	db ICON_SLOWPOKE     ; SLOWKING
+	db ICON_GHOST        ; MISDREAVUS
+	db ICON_UNOWN        ; UNOWN
+	db ICON_GHOST        ; WOBBUFFET
+	db ICON_EQUINE       ; GIRAFARIG
+	db ICON_BUG          ; PINECO
+	db ICON_BUG          ; FORRETRESS
+	db ICON_SERPENT      ; DUNSPARCE
+	db ICON_BUG          ; GLIGAR
+	db ICON_SERPENT      ; STEELIX
+	db ICON_MONSTER      ; SNUBBULL
+	db ICON_MONSTER      ; GRANBULL
+	db ICON_FISH         ; QWILFISH
+	db ICON_BUG          ; SCIZOR
+	db ICON_BUG          ; SHUCKLE
+	db ICON_BUG          ; HERACROSS
+	db ICON_FOX          ; SNEASEL
+	db ICON_MONSTER      ; TEDDIURSA
+	db ICON_MONSTER      ; URSARING
+	db ICON_BLOB         ; SLUGMA
+	db ICON_BLOB         ; MAGCARGO
+	db ICON_EQUINE       ; SWINUB
+	db ICON_EQUINE       ; PILOSWINE
+	db ICON_SHELL        ; CORSOLA
+	db ICON_FISH         ; REMORAID
+	db ICON_FISH         ; OCTILLERY
+	db ICON_MONSTER      ; DELIBIRD
+	db ICON_FISH         ; MANTINE
+	db ICON_BIRD         ; SKARMORY
+	db ICON_FOX          ; HOUNDOUR
+	db ICON_FOX          ; HOUNDOOM
+	db ICON_BIGMON       ; KINGDRA
+	db ICON_EQUINE       ; PHANPY
+	db ICON_EQUINE       ; DONPHAN
+	db ICON_VOLTORB      ; PORYGON2
+	db ICON_EQUINE       ; STANTLER
+	db ICON_MONSTER      ; SMEARGLE
+	db ICON_FIGHTER      ; TYROGUE
+	db ICON_FIGHTER      ; HITMONTOP
+	db ICON_HUMANSHAPE   ; SMOOCHUM
+	db ICON_HUMANSHAPE   ; ELEKID
+	db ICON_HUMANSHAPE   ; MAGBY
+	db ICON_EQUINE       ; MILTANK
+	db ICON_CLEFAIRY     ; BLISSEY
+	db ICON_FOX          ; RAIKOU
+	db ICON_FOX          ; ENTEI
+	db ICON_FOX          ; SUICUNE
+	db ICON_MONSTER      ; LARVITAR
+	db ICON_MONSTER      ; PUPITAR
+	db ICON_MONSTER      ; TYRANITAR
+	db ICON_LUGIA        ; LUGIA
+	db ICON_HO_OH        ; HO_OH
+	db ICON_HUMANSHAPE   ; CELEBI
+; 8ebbf
+
+INCBIN "baserom.gbc",$8ebbf,$8ec0d - $8ebbf
+
+PoliwagIcon:      INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d
+JigglypuffIcon:   INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d
+DiglettIcon:      INCBIN "gfx/icon/diglett.2bpp" ; 0x8ed0d
+PikachuIcon:      INCBIN "gfx/icon/pikachu.2bpp" ; 0x8ed8d
+StaryuIcon:       INCBIN "gfx/icon/staryu.2bpp" ; 0x8ee0d
+FishIcon:         INCBIN "gfx/icon/fish.2bpp" ; 0x8ee8d
+BirdIcon:         INCBIN "gfx/icon/bird.2bpp" ; 0x8ef0d
+MonsterIcon:      INCBIN "gfx/icon/monster.2bpp" ; 0x8ef8d
+ClefairyIcon:     INCBIN "gfx/icon/clefairy.2bpp" ; 0x8f00d
+OddishIcon:       INCBIN "gfx/icon/oddish.2bpp" ; 0x8f08d
+BugIcon:          INCBIN "gfx/icon/bug.2bpp" ; 0x8f10d
+GhostIcon:        INCBIN "gfx/icon/ghost.2bpp" ; 0x8f18d
+LaprasIcon:       INCBIN "gfx/icon/lapras.2bpp" ; 0x8f20d
+HumanshapeIcon:   INCBIN "gfx/icon/humanshape.2bpp" ; 0x8f28d
+FoxIcon:          INCBIN "gfx/icon/fox.2bpp" ; 0x8f30d
+EquineIcon:       INCBIN "gfx/icon/equine.2bpp" ; 0x8f38d
+ShellIcon:        INCBIN "gfx/icon/shell.2bpp" ; 0x8f40d
+BlobIcon:         INCBIN "gfx/icon/blob.2bpp" ; 0x8f48d
+SerpentIcon:      INCBIN "gfx/icon/serpent.2bpp" ; 0x8f50d
+VoltorbIcon:      INCBIN "gfx/icon/voltorb.2bpp" ; 0x8f58d
+SquirtleIcon:     INCBIN "gfx/icon/squirtle.2bpp" ; 0x8f60d
+BulbasaurIcon:    INCBIN "gfx/icon/bulbasaur.2bpp" ; 0x8f68d
+CharmanderIcon:   INCBIN "gfx/icon/charmander.2bpp" ; 0x8f70d
+CaterpillarIcon:  INCBIN "gfx/icon/caterpillar.2bpp" ; 0x8f78d
+UnownIcon:        INCBIN "gfx/icon/unown.2bpp" ; 0x8f80d
+GeodudeIcon:      INCBIN "gfx/icon/geodude.2bpp" ; 0x8f88d
+FighterIcon:      INCBIN "gfx/icon/fighter.2bpp" ; 0x8f90d
+EggIcon:          INCBIN "gfx/icon/egg.2bpp" ; 0x8f98d
+JellyfishIcon:    INCBIN "gfx/icon/jellyfish.2bpp" ; 0x8fa0d
+MothIcon:         INCBIN "gfx/icon/moth.2bpp" ; 0x8fa8d
+BatIcon:          INCBIN "gfx/icon/bat.2bpp" ; 0x8fb0d
+SnorlaxIcon:      INCBIN "gfx/icon/snorlax.2bpp" ; 0x8fb8d
+Ho_ohIcon:        INCBIN "gfx/icon/ho_oh.2bpp" ; 0x8fc0d
+LugiaIcon:        INCBIN "gfx/icon/lugia.2bpp" ; 0x8fc8d
+GyaradosIcon:     INCBIN "gfx/icon/gyarados.2bpp" ; 0x8fd0d
+SlowpokeIcon:     INCBIN "gfx/icon/slowpoke.2bpp" ; 0x8fd8d
+SudowoodoIcon:    INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d
+BigmonIcon:       INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d
+
+; 8ff0d end of bank
 
 SECTION "bank24",DATA,BANK[$24]