diff options
| -rw-r--r-- | data/pokemon/cries.asm | 510 | ||||
| -rw-r--r-- | data/pokemon/palettes.asm | 1012 | ||||
| -rw-r--r-- | data/trainers/palettes.asm | 132 | ||||
| -rwxr-xr-x | engine/gfx/color.asm | 12 | ||||
| -rw-r--r-- | gfx/font/font_inversed.1bpp | 1 | ||||
| -rw-r--r-- | gfx/font/font_inversed.png | bin | 0 -> 736 bytes | |||
| -rw-r--r-- | gfx/pokemon/egg/front.png | bin | 219 -> 240 bytes | |||
| -rw-r--r-- | gfx/pokemon/egg/normal.pal | 2 | ||||
| -rw-r--r-- | gfx/pokemon/egg/shiny.pal | 2 | ||||
| -rw-r--r-- | gfx/slots/slots.pal | 162 | ||||
| -rw-r--r-- | gfx/slots/slots_gold.pal | 79 | ||||
| -rw-r--r-- | gfx/slots/slots_silver.pal | 79 | ||||
| -rw-r--r-- | gfx/title/title_bg.pal | 52 | ||||
| -rw-r--r-- | gfx/title/title_bg_gold.pal | 24 | ||||
| -rw-r--r-- | gfx/title/title_bg_silver.pal | 24 | ||||
| -rw-r--r-- | layout.link | 17 | ||||
| -rw-r--r-- | main.asm | 20 | ||||
| -rw-r--r-- | tools/gfx.py | 4 |
18 files changed, 1063 insertions, 1069 deletions
diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index a57eac98..e6255e04 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -5,258 +5,258 @@ ENDM PokemonCries:: ; entries correspond to constants/pokemon_constants.asm - mon_cry CRY_BULBASAUR, $080, $081 ; BULBASAUR - mon_cry CRY_BULBASAUR, $020, $100 ; IVYSAUR - mon_cry CRY_BULBASAUR, $000, $140 ; VENUSAUR - mon_cry CRY_CHARMANDER, $060, $0c0 ; CHARMANDER - mon_cry CRY_CHARMANDER, $020, $0c0 ; CHARMELEON - mon_cry CRY_CHARMANDER, $000, $100 ; CHARIZARD - mon_cry CRY_SQUIRTLE, $060, $0c0 ; SQUIRTLE - mon_cry CRY_SQUIRTLE, $020, $0c0 ; WARTORTLE - mon_cry CRY_BLASTOISE, $000, $100 ; BLASTOISE - mon_cry CRY_CATERPIE, $080, $0a0 ; CATERPIE - mon_cry CRY_METAPOD, $0cc, $081 ; METAPOD - mon_cry CRY_CATERPIE, $077, $0c0 ; BUTTERFREE - mon_cry CRY_WEEDLE, $0ee, $081 ; WEEDLE - mon_cry CRY_BLASTOISE, $0ff, $081 ; KAKUNA - mon_cry CRY_BLASTOISE, $060, $100 ; BEEDRILL - mon_cry CRY_PIDGEY, $0df, $084 ; PIDGEY - mon_cry CRY_PIDGEOTTO, $028, $140 ; PIDGEOTTO - mon_cry CRY_PIDGEOTTO, $011, $17f ; PIDGEOT - mon_cry CRY_RATTATA, $000, $100 ; RATTATA - mon_cry CRY_RATTATA, $020, $17f ; RATICATE - mon_cry CRY_SPEAROW, $000, $100 ; SPEAROW - mon_cry CRY_FEAROW, $040, $120 ; FEAROW - mon_cry CRY_EKANS, $012, $0c0 ; EKANS - mon_cry CRY_EKANS, $0e0, $090 ; ARBOK - mon_cry CRY_BULBASAUR, $0ee, $081 ; PIKACHU - mon_cry CRY_RAICHU, $0ee, $088 ; RAICHU - mon_cry CRY_NIDORAN_M, $020, $0c0 ; SANDSHREW - mon_cry CRY_NIDORAN_M, $0ff, $17f ; SANDSLASH - mon_cry CRY_NIDORAN_F, $000, $100 ; NIDORAN_F - mon_cry CRY_NIDORAN_F, $02c, $160 ; NIDORINA - mon_cry CRY_NIDOQUEEN, $000, $100 ; NIDOQUEEN - mon_cry CRY_NIDORAN_M, $000, $100 ; NIDORAN_M - mon_cry CRY_NIDORAN_M, $02c, $140 ; NIDORINO - mon_cry CRY_RAICHU, $000, $100 ; NIDOKING - mon_cry CRY_CLEFAIRY, $0cc, $081 ; CLEFAIRY - mon_cry CRY_CLEFAIRY, $0aa, $0a0 ; CLEFABLE - mon_cry CRY_VULPIX, $04f, $090 ; VULPIX - mon_cry CRY_VULPIX, $088, $0e0 ; NINETALES - mon_cry CRY_PIDGEY, $0ff, $0b5 ; JIGGLYPUFF - mon_cry CRY_PIDGEY, $068, $0e0 ; WIGGLYTUFF - mon_cry CRY_SQUIRTLE, $0e0, $100 ; ZUBAT - mon_cry CRY_SQUIRTLE, $0fa, $100 ; GOLBAT - mon_cry CRY_ODDISH, $0dd, $081 ; ODDISH - mon_cry CRY_ODDISH, $0aa, $0c0 ; GLOOM - mon_cry CRY_VILEPLUME, $022, $17f ; VILEPLUME - mon_cry CRY_PARAS, $020, $160 ; PARAS - mon_cry CRY_PARAS, $042, $17f ; PARASECT - mon_cry CRY_VENONAT, $044, $0c0 ; VENONAT - mon_cry CRY_VENONAT, $029, $100 ; VENOMOTH - mon_cry CRY_DIGLETT, $0aa, $081 ; DIGLETT - mon_cry CRY_DIGLETT, $02a, $090 ; DUGTRIO - mon_cry CRY_CLEFAIRY, $077, $090 ; MEOWTH - mon_cry CRY_CLEFAIRY, $099, $17f ; PERSIAN - mon_cry CRY_PSYDUCK, $020, $0e0 ; PSYDUCK - mon_cry CRY_PSYDUCK, $0ff, $0c0 ; GOLDUCK - mon_cry CRY_NIDOQUEEN, $0dd, $0e0 ; MANKEY - mon_cry CRY_NIDOQUEEN, $0af, $0c0 ; PRIMEAPE - mon_cry CRY_GROWLITHE, $020, $0c0 ; GROWLITHE - mon_cry CRY_WEEDLE, $000, $100 ; ARCANINE - mon_cry CRY_PIDGEY, $0ff, $17f ; POLIWAG - mon_cry CRY_PIDGEY, $077, $0e0 ; POLIWHIRL - mon_cry CRY_PIDGEY, $000, $17f ; POLIWRATH - mon_cry CRY_METAPOD, $0c0, $081 ; ABRA - mon_cry CRY_METAPOD, $0a8, $140 ; KADABRA - mon_cry CRY_METAPOD, $098, $17f ; ALAKAZAM - mon_cry CRY_GROWLITHE, $0ee, $081 ; MACHOP - mon_cry CRY_GROWLITHE, $048, $0e0 ; MACHOKE - mon_cry CRY_GROWLITHE, $008, $140 ; MACHAMP - mon_cry CRY_PSYDUCK, $055, $081 ; BELLSPROUT - mon_cry CRY_WEEPINBELL, $044, $0a0 ; WEEPINBELL - mon_cry CRY_WEEPINBELL, $066, $14c ; VICTREEBEL - mon_cry CRY_VENONAT, $000, $100 ; TENTACOOL - mon_cry CRY_VENONAT, $0ee, $17f ; TENTACRUEL - mon_cry CRY_VULPIX, $0f0, $090 ; GEODUDE - mon_cry CRY_VULPIX, $000, $100 ; GRAVELER - mon_cry CRY_GOLEM, $0e0, $0c0 ; GOLEM - mon_cry CRY_WEEPINBELL, $000, $100 ; PONYTA - mon_cry CRY_WEEPINBELL, $020, $140 ; RAPIDASH - mon_cry CRY_SLOWPOKE, $000, $100 ; SLOWPOKE - mon_cry CRY_GROWLITHE, $000, $100 ; SLOWBRO - mon_cry CRY_METAPOD, $080, $0e0 ; MAGNEMITE - mon_cry CRY_METAPOD, $020, $140 ; MAGNETON - mon_cry CRY_SPEAROW, $0dd, $081 ; FARFETCH_D - mon_cry CRY_DIGLETT, $0bb, $081 ; DODUO - mon_cry CRY_DIGLETT, $099, $0a0 ; DODRIO - mon_cry CRY_SEEL, $088, $140 ; SEEL - mon_cry CRY_SEEL, $023, $17f ; DEWGONG - mon_cry CRY_GRIMER, $000, $100 ; GRIMER - mon_cry CRY_MUK, $0ef, $17f ; MUK - mon_cry CRY_FEAROW, $000, $100 ; SHELLDER - mon_cry CRY_FEAROW, $06f, $160 ; CLOYSTER - mon_cry CRY_METAPOD, $000, $100 ; GASTLY - mon_cry CRY_METAPOD, $030, $0c0 ; HAUNTER - mon_cry CRY_MUK, $000, $17f ; GENGAR - mon_cry CRY_EKANS, $0ff, $140 ; ONIX - mon_cry CRY_DROWZEE, $088, $0a0 ; DROWZEE - mon_cry CRY_DROWZEE, $0ee, $0c0 ; HYPNO - mon_cry CRY_KRABBY, $020, $160 ; KRABBY - mon_cry CRY_KRABBY, $0ee, $160 ; KINGLER - mon_cry CRY_VOLTORB, $0ed, $100 ; VOLTORB - mon_cry CRY_VOLTORB, $0a8, $110 ; ELECTRODE - mon_cry CRY_DIGLETT, $000, $100 ; EXEGGCUTE - mon_cry CRY_DROWZEE, $000, $100 ; EXEGGUTOR - mon_cry CRY_CLEFAIRY, $000, $100 ; CUBONE - mon_cry CRY_ODDISH, $04f, $0e0 ; MAROWAK - mon_cry CRY_GOLEM, $080, $140 ; HITMONLEE - mon_cry CRY_SEEL, $0ee, $140 ; HITMONCHAN - mon_cry CRY_SEEL, $000, $100 ; LICKITUNG - mon_cry CRY_GOLEM, $0e6, $15d ; KOFFING - mon_cry CRY_GOLEM, $0ff, $17f ; WEEZING - mon_cry CRY_CHARMANDER, $000, $100 ; RHYHORN - mon_cry CRY_RHYDON, $000, $100 ; RHYDON - mon_cry CRY_PIDGEOTTO, $00a, $140 ; CHANSEY - mon_cry CRY_GOLEM, $000, $100 ; TANGELA - mon_cry CRY_KANGASKHAN, $000, $100 ; KANGASKHAN - mon_cry CRY_CLEFAIRY, $099, $090 ; HORSEA - mon_cry CRY_CLEFAIRY, $03c, $081 ; SEADRA - mon_cry CRY_CATERPIE, $080, $0c0 ; GOLDEEN - mon_cry CRY_CATERPIE, $010, $17f ; SEAKING - mon_cry CRY_PARAS, $002, $0a0 ; STARYU - mon_cry CRY_PARAS, $000, $100 ; STARMIE - mon_cry CRY_KRABBY, $008, $0c0 ; MR__MIME - mon_cry CRY_CATERPIE, $000, $100 ; SCYTHER - mon_cry CRY_DROWZEE, $0ff, $17f ; JYNX - mon_cry CRY_VOLTORB, $08f, $17f ; ELECTABUZZ - mon_cry CRY_CHARMANDER, $0ff, $0b0 ; MAGMAR - mon_cry CRY_PIDGEOTTO, $000, $100 ; PINSIR - mon_cry CRY_SQUIRTLE, $011, $0c0 ; TAUROS - mon_cry CRY_EKANS, $080, $080 ; MAGIKARP - mon_cry CRY_EKANS, $000, $100 ; GYARADOS - mon_cry CRY_LAPRAS, $000, $100 ; LAPRAS - mon_cry CRY_PIDGEY, $0ff, $17f ; DITTO - mon_cry CRY_VENONAT, $088, $0e0 ; EEVEE - mon_cry CRY_VENONAT, $0aa, $17f ; VAPOREON - mon_cry CRY_VENONAT, $03d, $100 ; JOLTEON - mon_cry CRY_VENONAT, $010, $0a0 ; FLAREON - mon_cry CRY_WEEPINBELL, $0aa, $17f ; PORYGON - mon_cry CRY_GROWLITHE, $0f0, $081 ; OMANYTE - mon_cry CRY_GROWLITHE, $0ff, $0c0 ; OMASTAR - mon_cry CRY_CATERPIE, $0bb, $0c0 ; KABUTO - mon_cry CRY_FEAROW, $0ee, $081 ; KABUTOPS - mon_cry CRY_VILEPLUME, $020, $170 ; AERODACTYL - mon_cry CRY_GRIMER, $055, $081 ; SNORLAX - mon_cry CRY_RAICHU, $080, $0c0 ; ARTICUNO - mon_cry CRY_FEAROW, $0ff, $100 ; ZAPDOS - mon_cry CRY_RAICHU, $0f8, $0c0 ; MOLTRES - mon_cry CRY_BULBASAUR, $060, $0c0 ; DRATINI - mon_cry CRY_BULBASAUR, $040, $100 ; DRAGONAIR - mon_cry CRY_BULBASAUR, $03c, $140 ; DRAGONITE - mon_cry CRY_PARAS, $099, $17f ; MEWTWO - mon_cry CRY_PARAS, $0ee, $17f ; MEW - mon_cry CRY_CHIKORITA, -$010, $0b0 ; CHIKORITA - mon_cry CRY_CHIKORITA, -$022, $120 ; BAYLEEF - mon_cry CRY_CHIKORITA, -$0b7, $200 ; MEGANIUM - mon_cry CRY_CYNDAQUIL, $347, $080 ; CYNDAQUIL - mon_cry CRY_CYNDAQUIL, $321, $120 ; QUILAVA - mon_cry CRY_TYPHLOSION, $f00, $0d4 ; TYPHLOSION - mon_cry CRY_TOTODILE, $46c, $0e8 ; TOTODILE - mon_cry CRY_TOTODILE, $440, $110 ; CROCONAW - mon_cry CRY_TOTODILE, $3fc, $180 ; FERALIGATR - mon_cry CRY_SENTRET, $08a, $0b8 ; SENTRET - mon_cry CRY_SENTRET, $06b, $102 ; FURRET - mon_cry CRY_HOOTHOOT, $091, $0d8 ; HOOTHOOT - mon_cry CRY_HOOTHOOT, $000, $1a0 ; NOCTOWL - mon_cry CRY_LEDYBA, $000, $0de ; LEDYBA - mon_cry CRY_LEDYBA, -$096, $138 ; LEDIAN - mon_cry CRY_SPINARAK, $011, $200 ; SPINARAK - mon_cry CRY_SPINARAK, -$0ae, $1e2 ; ARIADOS - mon_cry CRY_SQUIRTLE, -$010, $140 ; CROBAT - mon_cry CRY_CYNDAQUIL, $3c9, $140 ; CHINCHOU - mon_cry CRY_CYNDAQUIL, $2d0, $110 ; LANTURN - mon_cry CRY_PICHU, $000, $140 ; PICHU - mon_cry CRY_CLEFFA, $061, $091 ; CLEFFA - mon_cry CRY_CHIKORITA, $0e8, $0e8 ; IGGLYBUFF - mon_cry CRY_TOGEPI, $010, $100 ; TOGEPI - mon_cry CRY_TOGETIC, $03b, $038 ; TOGETIC - mon_cry CRY_NATU, -$067, $100 ; NATU - mon_cry CRY_NATU, -$0a7, $168 ; XATU - mon_cry CRY_MAREEP, $022, $0d8 ; MAREEP - mon_cry CRY_MAREEP, -$007, $180 ; FLAAFFY - mon_cry CRY_AMPHAROS, -$07c, $0e8 ; AMPHAROS - mon_cry CRY_CLEFFA, $084, $150 ; BELLOSSOM - mon_cry CRY_MARILL, $11b, $120 ; MARILL - mon_cry CRY_MARILL, $0b6, $180 ; AZUMARILL - mon_cry CRY_CLEFFA, $f40, $180 ; SUDOWOODO - mon_cry CRY_CLEFFA, -$2a3, $1c8 ; POLITOED - mon_cry CRY_CLEFFA, $03b, $0c8 ; HOPPIP - mon_cry CRY_CLEFFA, $027, $138 ; SKIPLOOM - mon_cry CRY_CLEFFA, $000, $180 ; JUMPLUFF - mon_cry CRY_AIPOM, -$051, $0e8 ; AIPOM - mon_cry CRY_MARILL, $12b, $0b8 ; SUNKERN - mon_cry CRY_SUNFLORA, -$020, $180 ; SUNFLORA - mon_cry CRY_TOTODILE, $031, $0c8 ; YANMA - mon_cry CRY_WOOPER, $093, $0af ; WOOPER - mon_cry CRY_WOOPER, -$0c6, $140 ; QUAGSIRE - mon_cry CRY_AIPOM, $0a2, $140 ; ESPEON - mon_cry CRY_VENONAT, -$0e9, $0f0 ; UMBREON - mon_cry CRY_MARILL, -$01f, $180 ; MURKROW - mon_cry CRY_SLOWKING, $104, $200 ; SLOWKING - mon_cry CRY_HOOTHOOT, $130, $0e8 ; MISDREAVUS - mon_cry CRY_HOOTHOOT, $162, $100 ; UNOWN - mon_cry CRY_AMPHAROS, $27b, $144 ; WOBBUFFET - mon_cry CRY_GIRAFARIG, $041, $200 ; GIRAFARIG - mon_cry CRY_SLOWKING, $080, $100 ; PINECO - mon_cry CRY_SLOWKING, $000, $180 ; FORRETRESS - mon_cry CRY_DUNSPARCE, $1c4, $100 ; DUNSPARCE - mon_cry CRY_GLIGAR, -$102, $100 ; GLIGAR - mon_cry CRY_TYPHLOSION, $0ef, $0f7 ; STEELIX - mon_cry CRY_DUNSPARCE, $112, $0e8 ; SNUBBULL - mon_cry CRY_DUNSPARCE, $000, $180 ; GRANBULL - mon_cry CRY_SLOWKING, $160, $0e0 ; QWILFISH - mon_cry CRY_AMPHAROS, $000, $160 ; SCIZOR - mon_cry CRY_DUNSPARCE, $290, $0a8 ; SHUCKLE - mon_cry CRY_AMPHAROS, $035, $0e0 ; HERACROSS - mon_cry CRY_WOOPER, $053, $0af ; SNEASEL - mon_cry CRY_TEDDIURSA, $7a2, $06e ; TEDDIURSA - mon_cry CRY_TEDDIURSA, $640, $0d8 ; URSARING - mon_cry CRY_SLUGMA, -$1d8, $140 ; SLUGMA - mon_cry CRY_MAGCARGO, -$20d, $1c0 ; MAGCARGO - mon_cry CRY_CYNDAQUIL, $1fe, $140 ; SWINUB - mon_cry CRY_MAGCARGO, -$109, $100 ; PILOSWINE - mon_cry CRY_MAGCARGO, $0a1, $0e8 ; CORSOLA - mon_cry CRY_SUNFLORA, $00d, $100 ; REMORAID - mon_cry CRY_TOTODILE, $000, $180 ; OCTILLERY - mon_cry CRY_TEDDIURSA, $002, $06a ; DELIBIRD - mon_cry CRY_MANTINE, -$0be, $0f0 ; MANTINE - mon_cry CRY_AMPHAROS, $8a9, $180 ; SKARMORY - mon_cry CRY_CYNDAQUIL, $039, $140 ; HOUNDOUR - mon_cry CRY_TOTODILE, -$10a, $100 ; HOUNDOOM - mon_cry CRY_SLUGMA, $2fb, $100 ; KINGDRA - mon_cry CRY_SENTRET, $048, $230 ; PHANPY - mon_cry CRY_DONPHAN, $000, $1a0 ; DONPHAN - mon_cry CRY_GIRAFARIG, $073, $240 ; PORYGON2 - mon_cry CRY_AIPOM, -$160, $180 ; STANTLER - mon_cry CRY_PICHU, -$21a, $1f0 ; SMEARGLE - mon_cry CRY_AIPOM, $02c, $108 ; TYROGUE - mon_cry CRY_SLUGMA, $000, $100 ; HITMONTOP - mon_cry CRY_MARILL, $068, $100 ; SMOOCHUM - mon_cry CRY_SUNFLORA, -$2d8, $0b4 ; ELEKID - mon_cry CRY_TEDDIURSA, $176, $03a ; MAGBY - mon_cry CRY_GLIGAR, -$1cd, $1a0 ; MILTANK - mon_cry CRY_SLOWKING, $293, $140 ; BLISSEY - mon_cry CRY_RAIKOU, $22e, $120 ; RAIKOU - mon_cry CRY_ENTEI, $000, $1a0 ; ENTEI - mon_cry CRY_MAGCARGO, $000, $180 ; SUICUNE - mon_cry CRY_RAIKOU, $05f, $0d0 ; LARVITAR - mon_cry CRY_SPINARAK, -$1db, $150 ; PUPITAR - mon_cry CRY_RAIKOU, -$100, $180 ; TYRANITAR - mon_cry CRY_TYPHLOSION, $000, $100 ; LUGIA - mon_cry CRY_AIPOM, $000, $180 ; HO_OH - mon_cry CRY_ENTEI, $14a, $111 ; CELEBI - mon_cry CRY_NIDORAN_M, 0, 0 ; 252 - mon_cry CRY_NIDORAN_M, 0, 0 ; 253 - mon_cry CRY_NIDORAN_M, 0, 0 ; 254 - mon_cry CRY_NIDORAN_M, 0, 0 ; 255 + mon_cry CRY_BULBASAUR, 128, 129 ; BULBASAUR + mon_cry CRY_BULBASAUR, 32, 256 ; IVYSAUR + mon_cry CRY_BULBASAUR, 0, 320 ; VENUSAUR + mon_cry CRY_CHARMANDER, 96, 192 ; CHARMANDER + mon_cry CRY_CHARMANDER, 32, 192 ; CHARMELEON + mon_cry CRY_CHARMANDER, 0, 256 ; CHARIZARD + mon_cry CRY_SQUIRTLE, 96, 192 ; SQUIRTLE + mon_cry CRY_SQUIRTLE, 32, 192 ; WARTORTLE + mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE + mon_cry CRY_CATERPIE, 128, 160 ; CATERPIE + mon_cry CRY_METAPOD, 204, 129 ; METAPOD + mon_cry CRY_CATERPIE, 119, 192 ; BUTTERFREE + mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE + mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA + mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL + mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY + mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO + mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT + mon_cry CRY_RATTATA, 0, 256 ; RATTATA + mon_cry CRY_RATTATA, 32, 383 ; RATICATE + mon_cry CRY_SPEAROW, 0, 256 ; SPEAROW + mon_cry CRY_FEAROW, 64, 288 ; FEAROW + mon_cry CRY_EKANS, 18, 192 ; EKANS + mon_cry CRY_EKANS, 224, 144 ; ARBOK + mon_cry CRY_BULBASAUR, 238, 129 ; PIKACHU + mon_cry CRY_RAICHU, 238, 136 ; RAICHU + mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW + mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH + mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F + mon_cry CRY_NIDORAN_F, 44, 352 ; NIDORINA + mon_cry CRY_NIDOQUEEN, 0, 256 ; NIDOQUEEN + mon_cry CRY_NIDORAN_M, 0, 256 ; NIDORAN_M + mon_cry CRY_NIDORAN_M, 44, 320 ; NIDORINO + mon_cry CRY_RAICHU, 0, 256 ; NIDOKING + mon_cry CRY_CLEFAIRY, 204, 129 ; CLEFAIRY + mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE + mon_cry CRY_VULPIX, 79, 144 ; VULPIX + mon_cry CRY_VULPIX, 136, 224 ; NINETALES + mon_cry CRY_PIDGEY, 255, 181 ; JIGGLYPUFF + mon_cry CRY_PIDGEY, 104, 224 ; WIGGLYTUFF + mon_cry CRY_SQUIRTLE, 224, 256 ; ZUBAT + mon_cry CRY_SQUIRTLE, 250, 256 ; GOLBAT + mon_cry CRY_ODDISH, 221, 129 ; ODDISH + mon_cry CRY_ODDISH, 170, 192 ; GLOOM + mon_cry CRY_VILEPLUME, 34, 383 ; VILEPLUME + mon_cry CRY_PARAS, 32, 352 ; PARAS + mon_cry CRY_PARAS, 66, 383 ; PARASECT + mon_cry CRY_VENONAT, 68, 192 ; VENONAT + mon_cry CRY_VENONAT, 41, 256 ; VENOMOTH + mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT + mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO + mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH + mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN + mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK + mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK + mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY + mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE + mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE + mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE + mon_cry CRY_PIDGEY, 255, 383 ; POLIWAG + mon_cry CRY_PIDGEY, 119, 224 ; POLIWHIRL + mon_cry CRY_PIDGEY, 0, 383 ; POLIWRATH + mon_cry CRY_METAPOD, 192, 129 ; ABRA + mon_cry CRY_METAPOD, 168, 320 ; KADABRA + mon_cry CRY_METAPOD, 152, 383 ; ALAKAZAM + mon_cry CRY_GROWLITHE, 238, 129 ; MACHOP + mon_cry CRY_GROWLITHE, 72, 224 ; MACHOKE + mon_cry CRY_GROWLITHE, 8, 320 ; MACHAMP + mon_cry CRY_PSYDUCK, 85, 129 ; BELLSPROUT + mon_cry CRY_WEEPINBELL, 68, 160 ; WEEPINBELL + mon_cry CRY_WEEPINBELL, 102, 332 ; VICTREEBEL + mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL + mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL + mon_cry CRY_VULPIX, 240, 144 ; GEODUDE + mon_cry CRY_VULPIX, 0, 256 ; GRAVELER + mon_cry CRY_GOLEM, 224, 192 ; GOLEM + mon_cry CRY_WEEPINBELL, 0, 256 ; PONYTA + mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH + mon_cry CRY_SLOWPOKE, 0, 256 ; SLOWPOKE + mon_cry CRY_GROWLITHE, 0, 256 ; SLOWBRO + mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE + mon_cry CRY_METAPOD, 32, 320 ; MAGNETON + mon_cry CRY_SPEAROW, 221, 129 ; FARFETCH_D + mon_cry CRY_DIGLETT, 187, 129 ; DODUO + mon_cry CRY_DIGLETT, 153, 160 ; DODRIO + mon_cry CRY_SEEL, 136, 320 ; SEEL + mon_cry CRY_SEEL, 35, 383 ; DEWGONG + mon_cry CRY_GRIMER, 0, 256 ; GRIMER + mon_cry CRY_MUK, 239, 383 ; MUK + mon_cry CRY_FEAROW, 0, 256 ; SHELLDER + mon_cry CRY_FEAROW, 111, 352 ; CLOYSTER + mon_cry CRY_METAPOD, 0, 256 ; GASTLY + mon_cry CRY_METAPOD, 48, 192 ; HAUNTER + mon_cry CRY_MUK, 0, 383 ; GENGAR + mon_cry CRY_EKANS, 255, 320 ; ONIX + mon_cry CRY_DROWZEE, 136, 160 ; DROWZEE + mon_cry CRY_DROWZEE, 238, 192 ; HYPNO + mon_cry CRY_KRABBY, 32, 352 ; KRABBY + mon_cry CRY_KRABBY, 238, 352 ; KINGLER + mon_cry CRY_VOLTORB, 237, 256 ; VOLTORB + mon_cry CRY_VOLTORB, 168, 272 ; ELECTRODE + mon_cry CRY_DIGLETT, 0, 256 ; EXEGGCUTE + mon_cry CRY_DROWZEE, 0, 256 ; EXEGGUTOR + mon_cry CRY_CLEFAIRY, 0, 256 ; CUBONE + mon_cry CRY_ODDISH, 79, 224 ; MAROWAK + mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE + mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN + mon_cry CRY_SEEL, 0, 256 ; LICKITUNG + mon_cry CRY_GOLEM, 230, 349 ; KOFFING + mon_cry CRY_GOLEM, 255, 383 ; WEEZING + mon_cry CRY_CHARMANDER, 0, 256 ; RHYHORN + mon_cry CRY_RHYDON, 0, 256 ; RHYDON + mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY + mon_cry CRY_GOLEM, 0, 256 ; TANGELA + mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN + mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA + mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA + mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN + mon_cry CRY_CATERPIE, 16, 383 ; SEAKING + mon_cry CRY_PARAS, 2, 160 ; STARYU + mon_cry CRY_PARAS, 0, 256 ; STARMIE + mon_cry CRY_KRABBY, 8, 192 ; MR__MIME + mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER + mon_cry CRY_DROWZEE, 255, 383 ; JYNX + mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ + mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR + mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR + mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS + mon_cry CRY_EKANS, 128, 128 ; MAGIKARP + mon_cry CRY_EKANS, 0, 256 ; GYARADOS + mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS + mon_cry CRY_PIDGEY, 255, 383 ; DITTO + mon_cry CRY_VENONAT, 136, 224 ; EEVEE + mon_cry CRY_VENONAT, 170, 383 ; VAPOREON + mon_cry CRY_VENONAT, 61, 256 ; JOLTEON + mon_cry CRY_VENONAT, 16, 160 ; FLAREON + mon_cry CRY_WEEPINBELL, 170, 383 ; PORYGON + mon_cry CRY_GROWLITHE, 240, 129 ; OMANYTE + mon_cry CRY_GROWLITHE, 255, 192 ; OMASTAR + mon_cry CRY_CATERPIE, 187, 192 ; KABUTO + mon_cry CRY_FEAROW, 238, 129 ; KABUTOPS + mon_cry CRY_VILEPLUME, 32, 368 ; AERODACTYL + mon_cry CRY_GRIMER, 85, 129 ; SNORLAX + mon_cry CRY_RAICHU, 128, 192 ; ARTICUNO + mon_cry CRY_FEAROW, 255, 256 ; ZAPDOS + mon_cry CRY_RAICHU, 248, 192 ; MOLTRES + mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI + mon_cry CRY_BULBASAUR, 64, 256 ; DRAGONAIR + mon_cry CRY_BULBASAUR, 60, 320 ; DRAGONITE + mon_cry CRY_PARAS, 153, 383 ; MEWTWO + mon_cry CRY_PARAS, 238, 383 ; MEW + mon_cry CRY_CHIKORITA, -16, 176 ; CHIKORITA + mon_cry CRY_CHIKORITA, -34, 288 ; BAYLEEF + mon_cry CRY_CHIKORITA, -183, 512 ; MEGANIUM + mon_cry CRY_CYNDAQUIL, 839, 128 ; CYNDAQUIL + mon_cry CRY_CYNDAQUIL, 801, 288 ; QUILAVA + mon_cry CRY_TYPHLOSION, 3840, 212 ; TYPHLOSION + mon_cry CRY_TOTODILE, 1132, 232 ; TOTODILE + mon_cry CRY_TOTODILE, 1088, 272 ; CROCONAW + mon_cry CRY_TOTODILE, 1020, 384 ; FERALIGATR + mon_cry CRY_SENTRET, 138, 184 ; SENTRET + mon_cry CRY_SENTRET, 107, 258 ; FURRET + mon_cry CRY_HOOTHOOT, 145, 216 ; HOOTHOOT + mon_cry CRY_HOOTHOOT, 0, 416 ; NOCTOWL + mon_cry CRY_LEDYBA, 0, 222 ; LEDYBA + mon_cry CRY_LEDYBA, -150, 312 ; LEDIAN + mon_cry CRY_SPINARAK, 17, 512 ; SPINARAK + mon_cry CRY_SPINARAK, -174, 482 ; ARIADOS + mon_cry CRY_SQUIRTLE, -16, 320 ; CROBAT + mon_cry CRY_CYNDAQUIL, 969, 320 ; CHINCHOU + mon_cry CRY_CYNDAQUIL, 720, 272 ; LANTURN + mon_cry CRY_PICHU, 0, 320 ; PICHU + mon_cry CRY_CLEFFA, 97, 145 ; CLEFFA + mon_cry CRY_CHIKORITA, 232, 232 ; IGGLYBUFF + mon_cry CRY_TOGEPI, 16, 256 ; TOGEPI + mon_cry CRY_TOGETIC, 59, 56 ; TOGETIC + mon_cry CRY_NATU, -103, 256 ; NATU + mon_cry CRY_NATU, -167, 360 ; XATU + mon_cry CRY_MAREEP, 34, 216 ; MAREEP + mon_cry CRY_MAREEP, -7, 384 ; FLAAFFY + mon_cry CRY_AMPHAROS, -124, 232 ; AMPHAROS + mon_cry CRY_CLEFFA, 132, 336 ; BELLOSSOM + mon_cry CRY_MARILL, 283, 288 ; MARILL + mon_cry CRY_MARILL, 182, 384 ; AZUMARILL + mon_cry CRY_CLEFFA, 3904, 384 ; SUDOWOODO + mon_cry CRY_CLEFFA, -675, 456 ; POLITOED + mon_cry CRY_CLEFFA, 59, 200 ; HOPPIP + mon_cry CRY_CLEFFA, 39, 312 ; SKIPLOOM + mon_cry CRY_CLEFFA, 0, 384 ; JUMPLUFF + mon_cry CRY_AIPOM, -81, 232 ; AIPOM + mon_cry CRY_MARILL, 299, 184 ; SUNKERN + mon_cry CRY_SUNFLORA, -32, 384 ; SUNFLORA + mon_cry CRY_TOTODILE, 49, 200 ; YANMA + mon_cry CRY_WOOPER, 147, 175 ; WOOPER + mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE + mon_cry CRY_AIPOM, 162, 320 ; ESPEON + mon_cry CRY_VENONAT, -233, 240 ; UMBREON + mon_cry CRY_MARILL, -31, 384 ; MURKROW + mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING + mon_cry CRY_HOOTHOOT, 304, 232 ; MISDREAVUS + mon_cry CRY_HOOTHOOT, 354, 256 ; UNOWN + mon_cry CRY_AMPHAROS, 635, 324 ; WOBBUFFET + mon_cry CRY_GIRAFARIG, 65, 512 ; GIRAFARIG + mon_cry CRY_SLOWKING, 128, 256 ; PINECO + mon_cry CRY_SLOWKING, 0, 384 ; FORRETRESS + mon_cry CRY_DUNSPARCE, 452, 256 ; DUNSPARCE + mon_cry CRY_GLIGAR, -258, 256 ; GLIGAR + mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX + mon_cry CRY_DUNSPARCE, 274, 232 ; SNUBBULL + mon_cry CRY_DUNSPARCE, 0, 384 ; GRANBULL + mon_cry CRY_SLOWKING, 352, 224 ; QWILFISH + mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR + mon_cry CRY_DUNSPARCE, 656, 168 ; SHUCKLE + mon_cry CRY_AMPHAROS, 53, 224 ; HERACROSS + mon_cry CRY_WOOPER, 83, 175 ; SNEASEL + mon_cry CRY_TEDDIURSA, 1954, 110 ; TEDDIURSA + mon_cry CRY_TEDDIURSA, 1600, 216 ; URSARING + mon_cry CRY_SLUGMA, -472, 320 ; SLUGMA + mon_cry CRY_MAGCARGO, -525, 448 ; MAGCARGO + mon_cry CRY_CYNDAQUIL, 510, 320 ; SWINUB + mon_cry CRY_MAGCARGO, -265, 256 ; PILOSWINE + mon_cry CRY_MAGCARGO, 161, 232 ; CORSOLA + mon_cry CRY_SUNFLORA, 13, 256 ; REMORAID + mon_cry CRY_TOTODILE, 0, 384 ; OCTILLERY + mon_cry CRY_TEDDIURSA, 2, 106 ; DELIBIRD + mon_cry CRY_MANTINE, -190, 240 ; MANTINE + mon_cry CRY_AMPHAROS, 2217, 384 ; SKARMORY + mon_cry CRY_CYNDAQUIL, 57, 320 ; HOUNDOUR + mon_cry CRY_TOTODILE, -266, 256 ; HOUNDOOM + mon_cry CRY_SLUGMA, 763, 256 ; KINGDRA + mon_cry CRY_SENTRET, 72, 560 ; PHANPY + mon_cry CRY_DONPHAN, 0, 416 ; DONPHAN + mon_cry CRY_GIRAFARIG, 115, 576 ; PORYGON2 + mon_cry CRY_AIPOM, -352, 384 ; STANTLER + mon_cry CRY_PICHU, -538, 496 ; SMEARGLE + mon_cry CRY_AIPOM, 44, 264 ; TYROGUE + mon_cry CRY_SLUGMA, 0, 256 ; HITMONTOP + mon_cry CRY_MARILL, 104, 256 ; SMOOCHUM + mon_cry CRY_SUNFLORA, -728, 180 ; ELEKID + mon_cry CRY_TEDDIURSA, 374, 58 ; MAGBY + mon_cry CRY_GLIGAR, -461, 416 ; MILTANK + mon_cry CRY_SLOWKING, 659, 320 ; BLISSEY + mon_cry CRY_RAIKOU, 558, 288 ; RAIKOU + mon_cry CRY_ENTEI, 0, 416 ; ENTEI + mon_cry CRY_MAGCARGO, 0, 384 ; SUICUNE + mon_cry CRY_RAIKOU, 95, 208 ; LARVITAR + mon_cry CRY_SPINARAK, -475, 336 ; PUPITAR + mon_cry CRY_RAIKOU, -256, 384 ; TYRANITAR + mon_cry CRY_TYPHLOSION, 0, 256 ; LUGIA + mon_cry CRY_AIPOM, 0, 384 ; HO_OH + mon_cry CRY_ENTEI, 330, 273 ; CELEBI + mon_cry CRY_NIDORAN_M, 0, 0 ; 252 + mon_cry CRY_NIDORAN_M, 0, 0 ; 253 + mon_cry CRY_NIDORAN_M, 0, 0 ; 254 + mon_cry CRY_NIDORAN_M, 0, 0 ; 255 diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 570ecbf6..7cdff532 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -12,508 +12,508 @@ PokemonPalettes: RGB 30, 22, 17 RGB 16, 14, 19 -BulbasaurPalette: INCLUDE "gfx/pokemon/bulbasaur/normal.pal" -BulbasaurShinyPalette: INCLUDE "gfx/pokemon/bulbasaur/shiny.pal" -IvysaurPalette: INCLUDE "gfx/pokemon/ivysaur/normal.pal" -IvysaurShinyPalette: INCLUDE "gfx/pokemon/ivysaur/shiny.pal" -VenusaurPalette: INCLUDE "gfx/pokemon/venusaur/normal.pal" -VenusaurShinyPalette: INCLUDE "gfx/pokemon/venusaur/shiny.pal" -CharmanderPalette: INCLUDE "gfx/pokemon/charmander/normal.pal" -CharmanderShinyPalette: INCLUDE "gfx/pokemon/charmander/shiny.pal" -CharmeleonPalette: INCLUDE "gfx/pokemon/charmeleon/normal.pal" -CharmeleonShinyPalette: INCLUDE "gfx/pokemon/charmeleon/shiny.pal" -CharizardPalette: INCLUDE "gfx/pokemon/charizard/normal.pal" -CharizardShinyPalette: INCLUDE "gfx/pokemon/charizard/shiny.pal" -SquirtlePalette: INCLUDE "gfx/pokemon/squirtle/normal.pal" -SquirtleShinyPalette: INCLUDE "gfx/pokemon/squirtle/shiny.pal" -WartortlePalette: INCLUDE "gfx/pokemon/wartortle/normal.pal" -WartortleShinyPalette: INCLUDE "gfx/pokemon/wartortle/shiny.pal" -BlastoisePalette: INCLUDE "gfx/pokemon/blastoise/normal.pal" -BlastoiseShinyPalette: INCLUDE "gfx/pokemon/blastoise/shiny.pal" -CaterpiePalette: INCLUDE "gfx/pokemon/caterpie/normal.pal" -CaterpieShinyPalette: INCLUDE "gfx/pokemon/caterpie/shiny.pal" -MetapodPalette: INCLUDE "gfx/pokemon/metapod/normal.pal" -MetapodShinyPalette: INCLUDE "gfx/pokemon/metapod/shiny.pal" -ButterfreePalette: INCLUDE "gfx/pokemon/butterfree/normal.pal" -ButterfreeShinyPalette: INCLUDE "gfx/pokemon/butterfree/shiny.pal" -WeedlePalette: INCLUDE "gfx/pokemon/weedle/normal.pal" -WeedleShinyPalette: INCLUDE "gfx/pokemon/weedle/shiny.pal" -KakunaPalette: INCLUDE "gfx/pokemon/kakuna/normal.pal" -KakunaShinyPalette: INCLUDE "gfx/pokemon/kakuna/shiny.pal" -BeedrillPalette: INCLUDE "gfx/pokemon/beedrill/normal.pal" -BeedrillShinyPalette: INCLUDE "gfx/pokemon/beedrill/shiny.pal" -PidgeyPalette: INCLUDE "gfx/pokemon/pidgey/normal.pal" -PidgeyShinyPalette: INCLUDE "gfx/pokemon/pidgey/shiny.pal" -PidgeottoPalette: INCLUDE "gfx/pokemon/pidgeotto/normal.pal" -PidgeottoShinyPalette: INCLUDE "gfx/pokemon/pidgeotto/shiny.pal" -PidgeotPalette: INCLUDE "gfx/pokemon/pidgeot/normal.pal" -PidgeotShinyPalette: INCLUDE "gfx/pokemon/pidgeot/shiny.pal" -RattataPalette: INCLUDE "gfx/pokemon/rattata/normal.pal" -RattataShinyPalette: INCLUDE "gfx/pokemon/rattata/shiny.pal" -RaticatePalette: INCLUDE "gfx/pokemon/raticate/normal.pal" -RaticateShinyPalette: INCLUDE "gfx/pokemon/raticate/shiny.pal" -SpearowPalette: INCLUDE "gfx/pokemon/spearow/normal.pal" -SpearowShinyPalette: INCLUDE "gfx/pokemon/spearow/shiny.pal" -FearowPalette: INCLUDE "gfx/pokemon/fearow/normal.pal" -FearowShinyPalette: INCLUDE "gfx/pokemon/fearow/shiny.pal" -EkansPalette: INCLUDE "gfx/pokemon/ekans/normal.pal" -EkansShinyPalette: INCLUDE "gfx/pokemon/ekans/shiny.pal" -ArbokPalette: INCLUDE "gfx/pokemon/arbok/normal.pal" -ArbokShinyPalette: INCLUDE "gfx/pokemon/arbok/shiny.pal" -PikachuPalette: INCLUDE "gfx/pokemon/pikachu/normal.pal" -PikachuShinyPalette: INCLUDE "gfx/pokemon/pikachu/shiny.pal" -RaichuPalette: INCLUDE "gfx/pokemon/raichu/normal.pal" -RaichuShinyPalette: INCLUDE "gfx/pokemon/raichu/shiny.pal" -SandshrewPalette: INCLUDE "gfx/pokemon/sandshrew/normal.pal" -SandshrewShinyPalette: INCLUDE "gfx/pokemon/sandshrew/shiny.pal" -SandslashPalette: INCLUDE "gfx/pokemon/sandslash/normal.pal" -SandslashShinyPalette: INCLUDE "gfx/pokemon/sandslash/shiny.pal" -Nidoran_fPalette: INCLUDE "gfx/pokemon/nidoran_f/normal.pal" -Nidoran_fShinyPalette: INCLUDE "gfx/pokemon/nidoran_f/shiny.pal" -NidorinaPalette: INCLUDE "gfx/pokemon/nidorina/normal.pal" -NidorinaShinyPalette: INCLUDE "gfx/pokemon/nidorina/shiny.pal" -NidoqueenPalette: INCLUDE "gfx/pokemon/nidoqueen/normal.pal" -NidoqueenShinyPalette: INCLUDE "gfx/pokemon/nidoqueen/shiny.pal" -Nidoran_mPalette: INCLUDE "gfx/pokemon/nidoran_m/normal.pal" -Nidoran_mShinyPalette: INCLUDE "gfx/pokemon/nidoran_m/shiny.pal" -NidorinoPalette: INCLUDE "gfx/pokemon/nidorino/normal.pal" -NidorinoShinyPalette: INCLUDE "gfx/pokemon/nidorino/shiny.pal" -NidokingPalette: INCLUDE "gfx/pokemon/nidoking/normal.pal" -NidokingShinyPalette: INCLUDE "gfx/pokemon/nidoking/shiny.pal" -ClefairyPalette: INCLUDE "gfx/pokemon/clefairy/normal.pal" -ClefairyShinyPalette: INCLUDE "gfx/pokemon/clefairy/shiny.pal" -ClefablePalette: INCLUDE "gfx/pokemon/clefable/normal.pal" -ClefableShinyPalette: INCLUDE "gfx/pokemon/clefable/shiny.pal" -VulpixPalette: INCLUDE "gfx/pokemon/vulpix/normal.pal" -VulpixShinyPalette: INCLUDE "gfx/pokemon/vulpix/shiny.pal" -NinetalesPalette: INCLUDE "gfx/pokemon/ninetales/normal.pal" -NinetalesShinyPalette: INCLUDE "gfx/pokemon/ninetales/shiny.pal" -JigglypuffPalette: INCLUDE "gfx/pokemon/jigglypuff/normal.pal" -JigglypuffShinyPalette: INCLUDE "gfx/pokemon/jigglypuff/shiny.pal" -WigglytuffPalette: INCLUDE "gfx/pokemon/wigglytuff/normal.pal" -WigglytuffShinyPalette: INCLUDE "gfx/pokemon/wigglytuff/shiny.pal" -ZubatPalette: INCLUDE "gfx/pokemon/zubat/normal.pal" -ZubatShinyPalette: INCLUDE "gfx/pokemon/zubat/shiny.pal" -GolbatPalette: INCLUDE "gfx/pokemon/golbat/normal.pal" -GolbatShinyPalette: INCLUDE "gfx/pokemon/golbat/shiny.pal" -OddishPalette: INCLUDE "gfx/pokemon/oddish/normal.pal" -OddishShinyPalette: INCLUDE "gfx/pokemon/oddish/shiny.pal" -GloomPalette: INCLUDE "gfx/pokemon/gloom/normal.pal" -GloomShinyPalette: INCLUDE "gfx/pokemon/gloom/shiny.pal" -VileplumePalette: INCLUDE "gfx/pokemon/vileplume/normal.pal" -VileplumeShinyPalette: INCLUDE "gfx/pokemon/vileplume/shiny.pal" -ParasPalette: INCLUDE "gfx/pokemon/paras/normal.pal" -ParasShinyPalette: INCLUDE "gfx/pokemon/paras/shiny.pal" -ParasectPalette: INCLUDE "gfx/pokemon/parasect/normal.pal" -ParasectShinyPalette: INCLUDE "gfx/pokemon/parasect/shiny.pal" -VenonatPalette: INCLUDE "gfx/pokemon/venonat/normal.pal" -VenonatShinyPalette: INCLUDE "gfx/pokemon/venonat/shiny.pal" -VenomothPalette: INCLUDE "gfx/pokemon/venomoth/normal.pal" -VenomothShinyPalette: INCLUDE "gfx/pokemon/venomoth/shiny.pal" -DiglettPalette: INCLUDE "gfx/pokemon/diglett/normal.pal" -DiglettShinyPalette: INCLUDE "gfx/pokemon/diglett/shiny.pal" -DugtrioPalette: INCLUDE "gfx/pokemon/dugtrio/normal.pal" -DugtrioShinyPalette: INCLUDE "gfx/pokemon/dugtrio/shiny.pal" -MeowthPalette: INCLUDE "gfx/pokemon/meowth/normal.pal" -MeowthShinyPalette: INCLUDE "gfx/pokemon/meowth/shiny.pal" -PersianPalette: INCLUDE "gfx/pokemon/persian/normal.pal" -PersianShinyPalette: INCLUDE "gfx/pokemon/persian/shiny.pal" -PsyduckPalette: INCLUDE "gfx/pokemon/psyduck/normal.pal" -PsyduckShinyPalette: INCLUDE "gfx/pokemon/psyduck/shiny.pal" -GolduckPalette: INCLUDE "gfx/pokemon/golduck/normal.pal" -GolduckShinyPalette: INCLUDE "gfx/pokemon/golduck/shiny.pal" -MankeyPalette: INCLUDE "gfx/pokemon/mankey/normal.pal" -MankeyShinyPalette: INCLUDE "gfx/pokemon/mankey/shiny.pal" -PrimeapePalette: INCLUDE "gfx/pokemon/primeape/normal.pal" -PrimeapeShinyPalette: INCLUDE "gfx/pokemon/primeape/shiny.pal" -GrowlithePalette: INCLUDE "gfx/pokemon/growlithe/normal.pal" -GrowlitheShinyPalette: INCLUDE "gfx/pokemon/growlithe/shiny.pal" -ArcaninePalette: INCLUDE "gfx/pokemon/arcanine/normal.pal" -ArcanineShinyPalette: INCLUDE "gfx/pokemon/arcanine/shiny.pal" -PoliwagPalette: INCLUDE "gfx/pokemon/poliwag/normal.pal" -PoliwagShinyPalette: INCLUDE "gfx/pokemon/poliwag/shiny.pal" -PoliwhirlPalette: INCLUDE "gfx/pokemon/poliwhirl/normal.pal" -PoliwhirlShinyPalette: INCLUDE "gfx/pokemon/poliwhirl/shiny.pal" -PoliwrathPalette: INCLUDE "gfx/pokemon/poliwrath/normal.pal" -PoliwrathShinyPalette: INCLUDE "gfx/pokemon/poliwrath/shiny.pal" -AbraPalette: INCLUDE "gfx/pokemon/abra/normal.pal" -AbraShinyPalette: INCLUDE "gfx/pokemon/abra/shiny.pal" -KadabraPalette: INCLUDE "gfx/pokemon/kadabra/normal.pal" -KadabraShinyPalette: INCLUDE "gfx/pokemon/kadabra/shiny.pal" -AlakazamPalette: INCLUDE "gfx/pokemon/alakazam/normal.pal" -AlakazamShinyPalette: INCLUDE "gfx/pokemon/alakazam/shiny.pal" -MachopPalette: INCLUDE "gfx/pokemon/machop/normal.pal" -MachopShinyPalette: INCLUDE "gfx/pokemon/machop/shiny.pal" -MachokePalette: INCLUDE "gfx/pokemon/machoke/normal.pal" -MachokeShinyPalette: INCLUDE "gfx/pokemon/machoke/shiny.pal" -MachampPalette: INCLUDE "gfx/pokemon/machamp/normal.pal" -MachampShinyPalette: INCLUDE "gfx/pokemon/machamp/shiny.pal" -BellsproutPalette: INCLUDE "gfx/pokemon/bellsprout/normal.pal" -BellsproutShinyPalette: INCLUDE "gfx/pokemon/bellsprout/shiny.pal" -WeepinbellPalette: INCLUDE "gfx/pokemon/weepinbell/normal.pal" -WeepinbellShinyPalette: INCLUDE "gfx/pokemon/weepinbell/shiny.pal" -VictreebelPalette: INCLUDE "gfx/pokemon/victreebel/normal.pal" -VictreebelShinyPalette: INCLUDE "gfx/pokemon/victreebel/shiny.pal" -TentacoolPalette: INCLUDE "gfx/pokemon/tentacool/normal.pal" -TentacoolShinyPalette: INCLUDE "gfx/pokemon/tentacool/shiny.pal" -TentacruelPalette: INCLUDE "gfx/pokemon/tentacruel/normal.pal" -TentacruelShinyPalette: INCLUDE "gfx/pokemon/tentacruel/shiny.pal" -GeodudePalette: INCLUDE "gfx/pokemon/geodude/normal.pal" -GeodudeShinyPalette: INCLUDE "gfx/pokemon/geodude/shiny.pal" -GravelerPalette: INCLUDE "gfx/pokemon/graveler/normal.pal" -GravelerShinyPalette: INCLUDE "gfx/pokemon/graveler/shiny.pal" -GolemPalette: INCLUDE "gfx/pokemon/golem/normal.pal" -GolemShinyPalette: INCLUDE "gfx/pokemon/golem/shiny.pal" -PonytaPalette: INCLUDE "gfx/pokemon/ponyta/normal.pal" -PonytaShinyPalette: INCLUDE "gfx/pokemon/ponyta/shiny.pal" -RapidashPalette: INCLUDE "gfx/pokemon/rapidash/normal.pal" -RapidashShinyPalette: INCLUDE "gfx/pokemon/rapidash/shiny.pal" -SlowpokePalette: INCLUDE "gfx/pokemon/slowpoke/normal.pal" -SlowpokeShinyPalette: INCLUDE "gfx/pokemon/slowpoke/shiny.pal" -SlowbroPalette: INCLUDE "gfx/pokemon/slowbro/normal.pal" -SlowbroShinyPalette: INCLUDE "gfx/pokemon/slowbro/shiny.pal" -MagnemitePalette: INCLUDE "gfx/pokemon/magnemite/normal.pal" -MagnemiteShinyPalette: INCLUDE "gfx/pokemon/magnemite/shiny.pal" -MagnetonPalette: INCLUDE "gfx/pokemon/magneton/normal.pal" -MagnetonShinyPalette: INCLUDE "gfx/pokemon/magneton/shiny.pal" -Farfetch_dPalette: INCLUDE "gfx/pokemon/farfetch_d/normal.pal" -Farfetch_dShinyPalette: INCLUDE "gfx/pokemon/farfetch_d/shiny.pal" -DoduoPalette: INCLUDE "gfx/pokemon/doduo/normal.pal" -DoduoShinyPalette: INCLUDE "gfx/pokemon/doduo/shiny.pal" -DodrioPalette: INCLUDE "gfx/pokemon/dodrio/normal.pal" -DodrioShinyPalette: INCLUDE "gfx/pokemon/dodrio/shiny.pal" -SeelPalette: INCLUDE "gfx/pokemon/seel/normal.pal" -SeelShinyPalette: INCLUDE "gfx/pokemon/seel/shiny.pal" -DewgongPalette: INCLUDE "gfx/pokemon/dewgong/normal.pal" -DewgongShinyPalette: INCLUDE "gfx/pokemon/dewgong/shiny.pal" -GrimerPalette: INCLUDE "gfx/pokemon/grimer/normal.pal" -GrimerShinyPalette: INCLUDE "gfx/pokemon/grimer/shiny.pal" -MukPalette: INCLUDE "gfx/pokemon/muk/normal.pal" -MukShinyPalette: INCLUDE "gfx/pokemon/muk/shiny.pal" -ShellderPalette: INCLUDE "gfx/pokemon/shellder/normal.pal" -ShellderShinyPalette: INCLUDE "gfx/pokemon/shellder/shiny.pal" -CloysterPalette: INCLUDE "gfx/pokemon/cloyster/normal.pal" -CloysterShinyPalette: INCLUDE "gfx/pokemon/cloyster/shiny.pal" -GastlyPalette: INCLUDE "gfx/pokemon/gastly/normal.pal" -GastlyShinyPalette: INCLUDE "gfx/pokemon/gastly/shiny.pal" -HaunterPalette: INCLUDE "gfx/pokemon/haunter/normal.pal" -HaunterShinyPalette: INCLUDE "gfx/pokemon/haunter/shiny.pal" -GengarPalette: INCLUDE "gfx/pokemon/gengar/normal.pal" -GengarShinyPalette: INCLUDE "gfx/pokemon/gengar/shiny.pal" -OnixPalette: INCLUDE "gfx/pokemon/onix/normal.pal" -OnixShinyPalette: INCLUDE "gfx/pokemon/onix/shiny.pal" -DrowzeePalette: INCLUDE "gfx/pokemon/drowzee/normal.pal" -DrowzeeShinyPalette: INCLUDE "gfx/pokemon/drowzee/shiny.pal" -HypnoPalette: INCLUDE "gfx/pokemon/hypno/normal.pal" -HypnoShinyPalette: INCLUDE "gfx/pokemon/hypno/shiny.pal" -KrabbyPalette: INCLUDE "gfx/pokemon/krabby/normal.pal" -KrabbyShinyPalette: INCLUDE "gfx/pokemon/krabby/shiny.pal" -KinglerPalette: INCLUDE "gfx/pokemon/kingler/normal.pal" -KinglerShinyPalette: INCLUDE "gfx/pokemon/kingler/shiny.pal" -VoltorbPalette: INCLUDE "gfx/pokemon/voltorb/normal.pal" -VoltorbShinyPalette: INCLUDE "gfx/pokemon/voltorb/shiny.pal" -ElectrodePalette: INCLUDE "gfx/pokemon/electrode/normal.pal" -ElectrodeShinyPalette: INCLUDE "gfx/pokemon/electrode/shiny.pal" -ExeggcutePalette: INCLUDE "gfx/pokemon/exeggcute/normal.pal" -ExeggcuteShinyPalette: INCLUDE "gfx/pokemon/exeggcute/shiny.pal" -ExeggutorPalette: INCLUDE "gfx/pokemon/exeggutor/normal.pal" -ExeggutorShinyPalette: INCLUDE "gfx/pokemon/exeggutor/shiny.pal" -CubonePalette: INCLUDE "gfx/pokemon/cubone/normal.pal" -CuboneShinyPalette: INCLUDE "gfx/pokemon/cubone/shiny.pal" -MarowakPalette: INCLUDE "gfx/pokemon/marowak/normal.pal" -MarowakShinyPalette: INCLUDE "gfx/pokemon/marowak/shiny.pal" -HitmonleePalette: INCLUDE "gfx/pokemon/hitmonlee/normal.pal" -HitmonleeShinyPalette: INCLUDE "gfx/pokemon/hitmonlee/shiny.pal" -HitmonchanPalette: INCLUDE "gfx/pokemon/hitmonchan/normal.pal" -HitmonchanShinyPalette: INCLUDE "gfx/pokemon/hitmonchan/shiny.pal" -LickitungPalette: INCLUDE "gfx/pokemon/lickitung/normal.pal" -LickitungShinyPalette: INCLUDE "gfx/pokemon/lickitung/shiny.pal" -KoffingPalette: INCLUDE "gfx/pokemon/koffing/normal.pal" -KoffingShinyPalette: INCLUDE "gfx/pokemon/koffing/shiny.pal" -WeezingPalette: INCLUDE "gfx/pokemon/weezing/normal.pal" -WeezingShinyPalette: INCLUDE "gfx/pokemon/weezing/shiny.pal" -RhyhornPalette: INCLUDE "gfx/pokemon/rhyhorn/normal.pal" -RhyhornShinyPalette: INCLUDE "gfx/pokemon/rhyhorn/shiny.pal" -RhydonPalette: INCLUDE "gfx/pokemon/rhydon/normal.pal" -RhydonShinyPalette: INCLUDE "gfx/pokemon/rhydon/shiny.pal" -ChanseyPalette: INCLUDE "gfx/pokemon/chansey/normal.pal" -ChanseyShinyPalette: INCLUDE "gfx/pokemon/chansey/shiny.pal" -TangelaPalette: INCLUDE "gfx/pokemon/tangela/normal.pal" -TangelaShinyPalette: INCLUDE "gfx/pokemon/tangela/shiny.pal" -KangaskhanPalette: INCLUDE "gfx/pokemon/kangaskhan/normal.pal" -KangaskhanShinyPalette: INCLUDE "gfx/pokemon/kangaskhan/shiny.pal" -HorseaPalette: INCLUDE "gfx/pokemon/horsea/normal.pal" -HorseaShinyPalette: INCLUDE "gfx/pokemon/horsea/shiny.pal" -SeadraPalette: INCLUDE "gfx/pokemon/seadra/normal.pal" -SeadraShinyPalette: INCLUDE "gfx/pokemon/seadra/shiny.pal" -GoldeenPalette: INCLUDE "gfx/pokemon/goldeen/normal.pal" -GoldeenShinyPalette: INCLUDE "gfx/pokemon/goldeen/shiny.pal" -SeakingPalette: INCLUDE "gfx/pokemon/seaking/normal.pal" -SeakingShinyPalette: INCLUDE "gfx/pokemon/seaking/shiny.pal" -StaryuPalette: INCLUDE "gfx/pokemon/staryu/normal.pal" -StaryuShinyPalette: INCLUDE "gfx/pokemon/staryu/shiny.pal" -StarmiePalette: INCLUDE "gfx/pokemon/starmie/normal.pal" -StarmieShinyPalette: INCLUDE "gfx/pokemon/starmie/shiny.pal" -Mr__mimePalette: INCLUDE "gfx/pokemon/mr__mime/normal.pal" -Mr__mimeShinyPalette: INCLUDE "gfx/pokemon/mr__mime/shiny.pal" -ScytherPalette: INCLUDE "gfx/pokemon/scyther/normal.pal" -ScytherShinyPalette: INCLUDE "gfx/pokemon/scyther/shiny.pal" -JynxPalette: INCLUDE "gfx/pokemon/jynx/normal.pal" -JynxShinyPalette: INCLUDE "gfx/pokemon/jynx/shiny.pal" -ElectabuzzPalette: INCLUDE "gfx/pokemon/electabuzz/normal.pal" -ElectabuzzShinyPalette: INCLUDE "gfx/pokemon/electabuzz/shiny.pal" -MagmarPalette: INCLUDE "gfx/pokemon/magmar/normal.pal" -MagmarShinyPalette: INCLUDE "gfx/pokemon/magmar/shiny.pal" -PinsirPalette: INCLUDE "gfx/pokemon/pinsir/normal.pal" -PinsirShinyPalette: INCLUDE "gfx/pokemon/pinsir/shiny.pal" -TaurosPalette: INCLUDE "gfx/pokemon/tauros/normal.pal" -TaurosShinyPalette: INCLUDE "gfx/pokemon/tauros/shiny.pal" -MagikarpPalette: INCLUDE "gfx/pokemon/magikarp/normal.pal" -MagikarpShinyPalette: INCLUDE "gfx/pokemon/magikarp/shiny.pal" -GyaradosPalette: INCLUDE "gfx/pokemon/gyarados/normal.pal" -GyaradosShinyPalette: INCLUDE "gfx/pokemon/gyarados/shiny.pal" -LaprasPalette: INCLUDE "gfx/pokemon/lapras/normal.pal" -LaprasShinyPalette: INCLUDE "gfx/pokemon/lapras/shiny.pal" -DittoPalette: INCLUDE "gfx/pokemon/ditto/normal.pal" -DittoShinyPalette: INCLUDE "gfx/pokemon/ditto/shiny.pal" -EeveePalette: INCLUDE "gfx/pokemon/eevee/normal.pal" -EeveeShinyPalette: INCLUDE "gfx/pokemon/eevee/shiny.pal" -VaporeonPalette: INCLUDE "gfx/pokemon/vaporeon/normal.pal" -VaporeonShinyPalette: INCLUDE "gfx/pokemon/vaporeon/shiny.pal" -JolteonPalette: INCLUDE "gfx/pokemon/jolteon/normal.pal" -JolteonShinyPalette: INCLUDE "gfx/pokemon/jolteon/shiny.pal" -FlareonPalette: INCLUDE "gfx/pokemon/flareon/normal.pal" -FlareonShinyPalette: INCLUDE "gfx/pokemon/flareon/shiny.pal" -PorygonPalette: INCLUDE "gfx/pokemon/porygon/normal.pal" -PorygonShinyPalette: INCLUDE "gfx/pokemon/porygon/shiny.pal" -OmanytePalette: INCLUDE "gfx/pokemon/omanyte/normal.pal" -OmanyteShinyPalette: INCLUDE "gfx/pokemon/omanyte/shiny.pal" -OmastarPalette: INCLUDE "gfx/pokemon/omastar/normal.pal" -OmastarShinyPalette: INCLUDE "gfx/pokemon/omastar/shiny.pal" -KabutoPalette: INCLUDE "gfx/pokemon/kabuto/normal.pal" -KabutoShinyPalette: INCLUDE "gfx/pokemon/kabuto/shiny.pal" -KabutopsPalette: INCLUDE "gfx/pokemon/kabutops/normal.pal" -KabutopsShinyPalette: INCLUDE "gfx/pokemon/kabutops/shiny.pal" -AerodactylPalette: INCLUDE "gfx/pokemon/aerodactyl/normal.pal" -AerodactylShinyPalette: INCLUDE "gfx/pokemon/aerodactyl/shiny.pal" -SnorlaxPalette: INCLUDE "gfx/pokemon/snorlax/normal.pal" -SnorlaxShinyPalette: INCLUDE "gfx/pokemon/snorlax/shiny.pal" -ArticunoPalette: INCLUDE "gfx/pokemon/articuno/normal.pal" -ArticunoShinyPalette: INCLUDE "gfx/pokemon/articuno/shiny.pal" -ZapdosPalette: INCLUDE "gfx/pokemon/zapdos/normal.pal" -ZapdosShinyPalette: INCLUDE "gfx/pokemon/zapdos/shiny.pal" -MoltresPalette: INCLUDE "gfx/pokemon/moltres/normal.pal" -MoltresShinyPalette: INCLUDE "gfx/pokemon/moltres/shiny.pal" -DratiniPalette: INCLUDE "gfx/pokemon/dratini/normal.pal" -DratiniShinyPalette: INCLUDE "gfx/pokemon/dratini/shiny.pal" -DragonairPalette: INCLUDE "gfx/pokemon/dragonair/normal.pal" -DragonairShinyPalette: INCLUDE "gfx/pokemon/dragonair/shiny.pal" -DragonitePalette: INCLUDE "gfx/pokemon/dragonite/normal.pal" -DragoniteShinyPalette: INCLUDE "gfx/pokemon/dragonite/shiny.pal" -MewtwoPalette: INCLUDE "gfx/pokemon/mewtwo/normal.pal" -MewtwoShinyPalette: INCLUDE "gfx/pokemon/mewtwo/shiny.pal" -MewPalette: INCLUDE "gfx/pokemon/mew/normal.pal" -MewShinyPalette: INCLUDE "gfx/pokemon/mew/shiny.pal" -ChikoritaPalette: INCLUDE "gfx/pokemon/chikorita/normal.pal" -ChikoritaShinyPalette: INCLUDE "gfx/pokemon/chikorita/shiny.pal" -BayleefPalette: INCLUDE "gfx/pokemon/bayleef/normal.pal" -BayleefShinyPalette: INCLUDE "gfx/pokemon/bayleef/shiny.pal" -MeganiumPalette: INCLUDE "gfx/pokemon/meganium/normal.pal" -MeganiumShinyPalette: INCLUDE "gfx/pokemon/meganium/shiny.pal" -CyndaquilPalette: INCLUDE "gfx/pokemon/cyndaquil/normal.pal" -CyndaquilShinyPalette: INCLUDE "gfx/pokemon/cyndaquil/shiny.pal" -QuilavaPalette: INCLUDE "gfx/pokemon/quilava/normal.pal" -QuilavaShinyPalette: INCLUDE "gfx/pokemon/quilava/shiny.pal" -TyphlosionPalette: INCLUDE "gfx/pokemon/typhlosion/normal.pal" -TyphlosionShinyPalette: INCLUDE "gfx/pokemon/typhlosion/shiny.pal" -TotodilePalette: INCLUDE "gfx/pokemon/totodile/normal.pal" -TotodileShinyPalette: INCLUDE "gfx/pokemon/totodile/shiny.pal" -CroconawPalette: INCLUDE "gfx/pokemon/croconaw/normal.pal" -CroconawShinyPalette: INCLUDE "gfx/pokemon/croconaw/shiny.pal" -FeraligatrPalette: INCLUDE "gfx/pokemon/feraligatr/normal.pal" -FeraligatrShinyPalette: INCLUDE "gfx/pokemon/feraligatr/shiny.pal" -SentretPalette: INCLUDE "gfx/pokemon/sentret/normal.pal" -SentretShinyPalette: INCLUDE "gfx/pokemon/sentret/shiny.pal" -FurretPalette: INCLUDE "gfx/pokemon/furret/normal.pal" -FurretShinyPalette: INCLUDE "gfx/pokemon/furret/shiny.pal" -HoothootPalette: INCLUDE "gfx/pokemon/hoothoot/normal.pal" -HoothootShinyPalette: INCLUDE "gfx/pokemon/hoothoot/shiny.pal" -NoctowlPalette: INCLUDE "gfx/pokemon/noctowl/normal.pal" -NoctowlShinyPalette: INCLUDE "gfx/pokemon/noctowl/shiny.pal" -LedybaPalette: INCLUDE "gfx/pokemon/ledyba/normal.pal" -LedybaShinyPalette: INCLUDE "gfx/pokemon/ledyba/shiny.pal" -LedianPalette: INCLUDE "gfx/pokemon/ledian/normal.pal" -LedianShinyPalette: INCLUDE "gfx/pokemon/ledian/shiny.pal" -SpinarakPalette: INCLUDE "gfx/pokemon/spinarak/normal.pal" -SpinarakShinyPalette: INCLUDE "gfx/pokemon/spinarak/shiny.pal" -AriadosPalette: INCLUDE "gfx/pokemon/ariados/normal.pal" -AriadosShinyPalette: INCLUDE "gfx/pokemon/ariados/shiny.pal" -CrobatPalette: INCLUDE "gfx/pokemon/crobat/normal.pal" -CrobatShinyPalette: INCLUDE "gfx/pokemon/crobat/shiny.pal" -ChinchouPalette: INCLUDE "gfx/pokemon/chinchou/normal.pal" -ChinchouShinyPalette: INCLUDE "gfx/pokemon/chinchou/shiny.pal" -LanturnPalette: INCLUDE "gfx/pokemon/lanturn/normal.pal" -LanturnShinyPalette: INCLUDE "gfx/pokemon/lanturn/shiny.pal" -PichuPalette: INCLUDE "gfx/pokemon/pichu/normal.pal" -PichuShinyPalette: INCLUDE "gfx/pokemon/pichu/shiny.pal" -CleffaPalette: INCLUDE "gfx/pokemon/cleffa/normal.pal" -CleffaShinyPalette: INCLUDE "gfx/pokemon/cleffa/shiny.pal" -IgglybuffPalette: INCLUDE "gfx/pokemon/igglybuff/normal.pal" -IgglybuffShinyPalette: INCLUDE "gfx/pokemon/igglybuff/shiny.pal" -TogepiPalette: INCLUDE "gfx/pokemon/togepi/normal.pal" -TogepiShinyPalette: INCLUDE "gfx/pokemon/togepi/shiny.pal" -TogeticPalette: INCLUDE "gfx/pokemon/togetic/normal.pal" -TogeticShinyPalette: INCLUDE "gfx/pokemon/togetic/shiny.pal" -NatuPalette: INCLUDE "gfx/pokemon/natu/normal.pal" -NatuShinyPalette: INCLUDE "gfx/pokemon/natu/shiny.pal" -XatuPalette: INCLUDE "gfx/pokemon/xatu/normal.pal" -XatuShinyPalette: INCLUDE "gfx/pokemon/xatu/shiny.pal" -MareepPalette: INCLUDE "gfx/pokemon/mareep/normal.pal" -MareepShinyPalette: INCLUDE "gfx/pokemon/mareep/shiny.pal" -FlaaffyPalette: INCLUDE "gfx/pokemon/flaaffy/normal.pal" -FlaaffyShinyPalette: INCLUDE "gfx/pokemon/flaaffy/shiny.pal" -AmpharosPalette: INCLUDE "gfx/pokemon/ampharos/normal.pal" -AmpharosShinyPalette: INCLUDE "gfx/pokemon/ampharos/shiny.pal" -BellossomPalette: INCLUDE "gfx/pokemon/bellossom/normal.pal" -BellossomShinyPalette: INCLUDE "gfx/pokemon/bellossom/shiny.pal" -MarillPalette: INCLUDE "gfx/pokemon/marill/normal.pal" -MarillShinyPalette: INCLUDE "gfx/pokemon/marill/shiny.pal" -AzumarillPalette: INCLUDE "gfx/pokemon/azumarill/normal.pal" -AzumarillShinyPalette: INCLUDE "gfx/pokemon/azumarill/shiny.pal" -SudowoodoPalette: INCLUDE "gfx/pokemon/sudowoodo/normal.pal" -SudowoodoShinyPalette: INCLUDE "gfx/pokemon/sudowoodo/shiny.pal" -PolitoedPalette: INCLUDE "gfx/pokemon/politoed/normal.pal" -PolitoedShinyPalette: INCLUDE "gfx/pokemon/politoed/shiny.pal" -HoppipPalette: INCLUDE "gfx/pokemon/hoppip/normal.pal" -HoppipShinyPalette: INCLUDE "gfx/pokemon/hoppip/shiny.pal" -SkiploomPalette: INCLUDE "gfx/pokemon/skiploom/normal.pal" -SkiploomShinyPalette: INCLUDE "gfx/pokemon/skiploom/shiny.pal" -JumpluffPalette: INCLUDE "gfx/pokemon/jumpluff/normal.pal" -JumpluffShinyPalette: INCLUDE "gfx/pokemon/jumpluff/shiny.pal" -AipomPalette: INCLUDE "gfx/pokemon/aipom/normal.pal" -AipomShinyPalette: INCLUDE "gfx/pokemon/aipom/shiny.pal" -SunkernPalette: INCLUDE "gfx/pokemon/sunkern/normal.pal" -SunkernShinyPalette: INCLUDE "gfx/pokemon/sunkern/shiny.pal" -SunfloraPalette: INCLUDE "gfx/pokemon/sunflora/normal.pal" -SunfloraShinyPalette: INCLUDE "gfx/pokemon/sunflora/shiny.pal" -YanmaPalette: INCLUDE "gfx/pokemon/yanma/normal.pal" -YanmaShinyPalette: INCLUDE "gfx/pokemon/yanma/shiny.pal" -WooperPalette: INCLUDE "gfx/pokemon/wooper/normal.pal" -WooperShinyPalette: INCLUDE "gfx/pokemon/wooper/shiny.pal" -QuagsirePalette: INCLUDE "gfx/pokemon/quagsire/normal.pal" -QuagsireShinyPalette: INCLUDE "gfx/pokemon/quagsire/shiny.pal" -EspeonPalette: INCLUDE "gfx/pokemon/espeon/normal.pal" -EspeonShinyPalette: INCLUDE "gfx/pokemon/espeon/shiny.pal" -UmbreonPalette: INCLUDE "gfx/pokemon/umbreon/normal.pal" -UmbreonShinyPalette: INCLUDE "gfx/pokemon/umbreon/shiny.pal" -MurkrowPalette: INCLUDE "gfx/pokemon/murkrow/normal.pal" -MurkrowShinyPalette: INCLUDE "gfx/pokemon/murkrow/shiny.pal" -SlowkingPalette: INCLUDE "gfx/pokemon/slowking/normal.pal" -SlowkingShinyPalette: INCLUDE "gfx/pokemon/slowking/shiny.pal" -MisdreavusPalette: INCLUDE "gfx/pokemon/misdreavus/normal.pal" -MisdreavusShinyPalette: INCLUDE "gfx/pokemon/misdreavus/shiny.pal" -UnownPalette: INCLUDE "gfx/pokemon/unown/normal.pal" -UnownShinyPalette: INCLUDE "gfx/pokemon/unown/shiny.pal" -WobbuffetPalette: INCLUDE "gfx/pokemon/wobbuffet/normal.pal" -WobbuffetShinyPalette: INCLUDE "gfx/pokemon/wobbuffet/shiny.pal" -GirafarigPalette: INCLUDE "gfx/pokemon/girafarig/normal.pal" -GirafarigShinyPalette: INCLUDE "gfx/pokemon/girafarig/shiny.pal" -PinecoPalette: INCLUDE "gfx/pokemon/pineco/normal.pal" -PinecoShinyPalette: INCLUDE "gfx/pokemon/pineco/shiny.pal" -ForretressPalette: INCLUDE "gfx/pokemon/forretress/normal.pal" -ForretressShinyPalette: INCLUDE "gfx/pokemon/forretress/shiny.pal" -DunsparcePalette: INCLUDE "gfx/pokemon/dunsparce/normal.pal" -DunsparceShinyPalette: INCLUDE "gfx/pokemon/dunsparce/shiny.pal" -GligarPalette: INCLUDE "gfx/pokemon/gligar/normal.pal" -GligarShinyPalette: INCLUDE "gfx/pokemon/gligar/shiny.pal" -SteelixPalette: INCLUDE "gfx/pokemon/steelix/normal.pal" -SteelixShinyPalette: INCLUDE "gfx/pokemon/steelix/shiny.pal" -SnubbullPalette: INCLUDE "gfx/pokemon/snubbull/normal.pal" -SnubbullShinyPalette: INCLUDE "gfx/pokemon/snubbull/shiny.pal" -GranbullPalette: INCLUDE "gfx/pokemon/granbull/normal.pal" -GranbullShinyPalette: INCLUDE "gfx/pokemon/granbull/shiny.pal" -QwilfishPalette: INCLUDE "gfx/pokemon/qwilfish/normal.pal" -QwilfishShinyPalette: INCLUDE "gfx/pokemon/qwilfish/shiny.pal" -ScizorPalette: INCLUDE "gfx/pokemon/scizor/normal.pal" -ScizorShinyPalette: INCLUDE "gfx/pokemon/scizor/shiny.pal" -ShucklePalette: INCLUDE "gfx/pokemon/shuckle/normal.pal" -ShuckleShinyPalette: INCLUDE "gfx/pokemon/shuckle/shiny.pal" -HeracrossPalette: INCLUDE "gfx/pokemon/heracross/normal.pal" -HeracrossShinyPalette: INCLUDE "gfx/pokemon/heracross/shiny.pal" -SneaselPalette: INCLUDE "gfx/pokemon/sneasel/normal.pal" -SneaselShinyPalette: INCLUDE "gfx/pokemon/sneasel/shiny.pal" -TeddiursaPalette: INCLUDE "gfx/pokemon/teddiursa/normal.pal" -TeddiursaShinyPalette: INCLUDE "gfx/pokemon/teddiursa/shiny.pal" -UrsaringPalette: INCLUDE "gfx/pokemon/ursaring/normal.pal" -UrsaringShinyPalette: INCLUDE "gfx/pokemon/ursaring/shiny.pal" -SlugmaPalette: INCLUDE "gfx/pokemon/slugma/normal.pal" -SlugmaShinyPalette: INCLUDE "gfx/pokemon/slugma/shiny.pal" -MagcargoPalette: INCLUDE "gfx/pokemon/magcargo/normal.pal" -MagcargoShinyPalette: INCLUDE "gfx/pokemon/magcargo/shiny.pal" -SwinubPalette: INCLUDE "gfx/pokemon/swinub/normal.pal" -SwinubShinyPalette: INCLUDE "gfx/pokemon/swinub/shiny.pal" -PiloswinePalette: INCLUDE "gfx/pokemon/piloswine/normal.pal" -PiloswineShinyPalette: INCLUDE "gfx/pokemon/piloswine/shiny.pal" -CorsolaPalette: INCLUDE "gfx/pokemon/corsola/normal.pal" -CorsolaShinyPalette: INCLUDE "gfx/pokemon/corsola/shiny.pal" -RemoraidPalette: INCLUDE "gfx/pokemon/remoraid/normal.pal" -RemoraidShinyPalette: INCLUDE "gfx/pokemon/remoraid/shiny.pal" -OctilleryPalette: INCLUDE "gfx/pokemon/octillery/normal.pal" -OctilleryShinyPalette: INCLUDE "gfx/pokemon/octillery/shiny.pal" -DelibirdPalette: INCLUDE "gfx/pokemon/delibird/normal.pal" -DelibirdShinyPalette: INCLUDE "gfx/pokemon/delibird/shiny.pal" -MantinePalette: INCLUDE "gfx/pokemon/mantine/normal.pal" -MantineShinyPalette: INCLUDE "gfx/pokemon/mantine/shiny.pal" -SkarmoryPalette: INCLUDE "gfx/pokemon/skarmory/normal.pal" -SkarmoryShinyPalette: INCLUDE "gfx/pokemon/skarmory/shiny.pal" -HoundourPalette: INCLUDE "gfx/pokemon/houndour/normal.pal" -HoundourShinyPalette: INCLUDE "gfx/pokemon/houndour/shiny.pal" -HoundoomPalette: INCLUDE "gfx/pokemon/houndoom/normal.pal" -HoundoomShinyPalette: INCLUDE "gfx/pokemon/houndoom/shiny.pal" -KingdraPalette: INCLUDE "gfx/pokemon/kingdra/normal.pal" -KingdraShinyPalette: INCLUDE "gfx/pokemon/kingdra/shiny.pal" -PhanpyPalette: INCLUDE "gfx/pokemon/phanpy/normal.pal" -PhanpyShinyPalette: INCLUDE "gfx/pokemon/phanpy/shiny.pal" -DonphanPalette: INCLUDE "gfx/pokemon/donphan/normal.pal" -DonphanShinyPalette: INCLUDE "gfx/pokemon/donphan/shiny.pal" -Porygon2Palette: INCLUDE "gfx/pokemon/porygon2/normal.pal" -Porygon2ShinyPalette: INCLUDE "gfx/pokemon/porygon2/shiny.pal" -StantlerPalette: INCLUDE "gfx/pokemon/stantler/normal.pal" -StantlerShinyPalette: INCLUDE "gfx/pokemon/stantler/shiny.pal" -SmearglePalette: INCLUDE "gfx/pokemon/smeargle/normal.pal" -SmeargleShinyPalette: INCLUDE "gfx/pokemon/smeargle/shiny.pal" -TyroguePalette: INCLUDE "gfx/pokemon/tyrogue/normal.pal" -TyrogueShinyPalette: INCLUDE "gfx/pokemon/tyrogue/shiny.pal" -HitmontopPalette: INCLUDE "gfx/pokemon/hitmontop/normal.pal" -HitmontopShinyPalette: INCLUDE "gfx/pokemon/hitmontop/shiny.pal" -SmoochumPalette: INCLUDE "gfx/pokemon/smoochum/normal.pal" -SmoochumShinyPalette: INCLUDE "gfx/pokemon/smoochum/shiny.pal" -ElekidPalette: INCLUDE "gfx/pokemon/elekid/normal.pal" -ElekidShinyPalette: INCLUDE "gfx/pokemon/elekid/shiny.pal" -MagbyPalette: INCLUDE "gfx/pokemon/magby/normal.pal" -MagbyShinyPalette: INCLUDE "gfx/pokemon/magby/shiny.pal" -MiltankPalette: INCLUDE "gfx/pokemon/miltank/normal.pal" -MiltankShinyPalette: INCLUDE "gfx/pokemon/miltank/shiny.pal" -BlisseyPalette: INCLUDE "gfx/pokemon/blissey/normal.pal" -BlisseyShinyPalette: INCLUDE "gfx/pokemon/blissey/shiny.pal" -RaikouPalette: INCLUDE "gfx/pokemon/raikou/normal.pal" -RaikouShinyPalette: INCLUDE "gfx/pokemon/raikou/shiny.pal" -EnteiPalette: INCLUDE "gfx/pokemon/entei/normal.pal" -EnteiShinyPalette: INCLUDE "gfx/pokemon/entei/shiny.pal" -SuicunePalette: INCLUDE "gfx/pokemon/suicune/normal.pal" -SuicuneShinyPalette: INCLUDE "gfx/pokemon/suicune/shiny.pal" -LarvitarPalette: INCLUDE "gfx/pokemon/larvitar/normal.pal" -LarvitarShinyPalette: INCLUDE "gfx/pokemon/larvitar/shiny.pal" -PupitarPalette: INCLUDE "gfx/pokemon/pupitar/normal.pal" -PupitarShinyPalette: INCLUDE "gfx/pokemon/pupitar/shiny.pal" -TyranitarPalette: INCLUDE "gfx/pokemon/tyranitar/normal.pal" -TyranitarShinyPalette: INCLUDE "gfx/pokemon/tyranitar/shiny.pal" -LugiaPalette: INCLUDE "gfx/pokemon/lugia/normal.pal" -LugiaShinyPalette: INCLUDE "gfx/pokemon/lugia/shiny.pal" -Ho_ohPalette: INCLUDE "gfx/pokemon/ho_oh/normal.pal" -Ho_ohShinyPalette: INCLUDE "gfx/pokemon/ho_oh/shiny.pal" -CelebiPalette: INCLUDE "gfx/pokemon/celebi/normal.pal" -CelebiShinyPalette: INCLUDE "gfx/pokemon/celebi/shiny.pal" +INCLUDE "gfx/pokemon/bulbasaur/normal.pal" +INCLUDE "gfx/pokemon/bulbasaur/shiny.pal" +INCLUDE "gfx/pokemon/ivysaur/normal.pal" +INCLUDE "gfx/pokemon/ivysaur/shiny.pal" +INCLUDE "gfx/pokemon/venusaur/normal.pal" +INCLUDE "gfx/pokemon/venusaur/shiny.pal" +INCLUDE "gfx/pokemon/charmander/normal.pal" +INCLUDE "gfx/pokemon/charmander/shiny.pal" +INCLUDE "gfx/pokemon/charmeleon/normal.pal" +INCLUDE "gfx/pokemon/charmeleon/shiny.pal" +INCLUDE "gfx/pokemon/charizard/normal.pal" +INCLUDE "gfx/pokemon/charizard/shiny.pal" +INCLUDE "gfx/pokemon/squirtle/normal.pal" +INCLUDE "gfx/pokemon/squirtle/shiny.pal" +INCLUDE "gfx/pokemon/wartortle/normal.pal" +INCLUDE "gfx/pokemon/wartortle/shiny.pal" +INCLUDE "gfx/pokemon/blastoise/normal.pal" +INCLUDE "gfx/pokemon/blastoise/shiny.pal" +INCLUDE "gfx/pokemon/caterpie/normal.pal" +INCLUDE "gfx/pokemon/caterpie/shiny.pal" +INCLUDE "gfx/pokemon/metapod/normal.pal" +INCLUDE "gfx/pokemon/metapod/shiny.pal" +INCLUDE "gfx/pokemon/butterfree/normal.pal" +INCLUDE "gfx/pokemon/butterfree/shiny.pal" +INCLUDE "gfx/pokemon/weedle/normal.pal" +INCLUDE "gfx/pokemon/weedle/shiny.pal" +INCLUDE "gfx/pokemon/kakuna/normal.pal" +INCLUDE "gfx/pokemon/kakuna/shiny.pal" +INCLUDE "gfx/pokemon/beedrill/normal.pal" +INCLUDE "gfx/pokemon/beedrill/shiny.pal" +INCLUDE "gfx/pokemon/pidgey/normal.pal" +INCLUDE "gfx/pokemon/pidgey/shiny.pal" +INCLUDE "gfx/pokemon/pidgeotto/normal.pal" +INCLUDE "gfx/pokemon/pidgeotto/shiny.pal" +INCLUDE "gfx/pokemon/pidgeot/normal.pal" +INCLUDE "gfx/pokemon/pidgeot/shiny.pal" +INCLUDE "gfx/pokemon/rattata/normal.pal" +INCLUDE "gfx/pokemon/rattata/shiny.pal" +INCLUDE "gfx/pokemon/raticate/normal.pal" +INCLUDE "gfx/pokemon/raticate/shiny.pal" +INCLUDE "gfx/pokemon/spearow/normal.pal" +INCLUDE "gfx/pokemon/spearow/shiny.pal" +INCLUDE "gfx/pokemon/fearow/normal.pal" +INCLUDE "gfx/pokemon/fearow/shiny.pal" +INCLUDE "gfx/pokemon/ekans/normal.pal" +INCLUDE "gfx/pokemon/ekans/shiny.pal" +INCLUDE "gfx/pokemon/arbok/normal.pal" +INCLUDE "gfx/pokemon/arbok/shiny.pal" +INCLUDE "gfx/pokemon/pikachu/normal.pal" +INCLUDE "gfx/pokemon/pikachu/shiny.pal" +INCLUDE "gfx/pokemon/raichu/normal.pal" +INCLUDE "gfx/pokemon/raichu/shiny.pal" +INCLUDE "gfx/pokemon/sandshrew/normal.pal" +INCLUDE "gfx/pokemon/sandshrew/shiny.pal" +INCLUDE "gfx/pokemon/sandslash/normal.pal" +INCLUDE "gfx/pokemon/sandslash/shiny.pal" +INCLUDE "gfx/pokemon/nidoran_f/normal.pal" +INCLUDE "gfx/pokemon/nidoran_f/shiny.pal" +INCLUDE "gfx/pokemon/nidorina/normal.pal" +INCLUDE "gfx/pokemon/nidorina/shiny.pal" +INCLUDE "gfx/pokemon/nidoqueen/normal.pal" +INCLUDE "gfx/pokemon/nidoqueen/shiny.pal" +INCLUDE "gfx/pokemon/nidoran_m/normal.pal" +INCLUDE "gfx/pokemon/nidoran_m/shiny.pal" +INCLUDE "gfx/pokemon/nidorino/normal.pal" +INCLUDE "gfx/pokemon/nidorino/shiny.pal" +INCLUDE "gfx/pokemon/nidoking/normal.pal" +INCLUDE "gfx/pokemon/nidoking/shiny.pal" +INCLUDE "gfx/pokemon/clefairy/normal.pal" +INCLUDE "gfx/pokemon/clefairy/shiny.pal" +INCLUDE "gfx/pokemon/clefable/normal.pal" +INCLUDE "gfx/pokemon/clefable/shiny.pal" +INCLUDE "gfx/pokemon/vulpix/normal.pal" +INCLUDE "gfx/pokemon/vulpix/shiny.pal" +INCLUDE "gfx/pokemon/ninetales/normal.pal" +INCLUDE "gfx/pokemon/ninetales/shiny.pal" +INCLUDE "gfx/pokemon/jigglypuff/normal.pal" +INCLUDE "gfx/pokemon/jigglypuff/shiny.pal" +INCLUDE "gfx/pokemon/wigglytuff/normal.pal" +INCLUDE "gfx/pokemon/wigglytuff/shiny.pal" +INCLUDE "gfx/pokemon/zubat/normal.pal" +INCLUDE "gfx/pokemon/zubat/shiny.pal" +INCLUDE "gfx/pokemon/golbat/normal.pal" +INCLUDE "gfx/pokemon/golbat/shiny.pal" +INCLUDE "gfx/pokemon/oddish/normal.pal" +INCLUDE "gfx/pokemon/oddish/shiny.pal" +INCLUDE "gfx/pokemon/gloom/normal.pal" +INCLUDE "gfx/pokemon/gloom/shiny.pal" +INCLUDE "gfx/pokemon/vileplume/normal.pal" +INCLUDE "gfx/pokemon/vileplume/shiny.pal" +INCLUDE "gfx/pokemon/paras/normal.pal" +INCLUDE "gfx/pokemon/paras/shiny.pal" +INCLUDE "gfx/pokemon/parasect/normal.pal" +INCLUDE "gfx/pokemon/parasect/shiny.pal" +INCLUDE "gfx/pokemon/venonat/normal.pal" +INCLUDE "gfx/pokemon/venonat/shiny.pal" +INCLUDE "gfx/pokemon/venomoth/normal.pal" +INCLUDE "gfx/pokemon/venomoth/shiny.pal" +INCLUDE "gfx/pokemon/diglett/normal.pal" +INCLUDE "gfx/pokemon/diglett/shiny.pal" +INCLUDE "gfx/pokemon/dugtrio/normal.pal" +INCLUDE "gfx/pokemon/dugtrio/shiny.pal" +INCLUDE "gfx/pokemon/meowth/normal.pal" +INCLUDE "gfx/pokemon/meowth/shiny.pal" +INCLUDE "gfx/pokemon/persian/normal.pal" +INCLUDE "gfx/pokemon/persian/shiny.pal" +INCLUDE "gfx/pokemon/psyduck/normal.pal" +INCLUDE "gfx/pokemon/psyduck/shiny.pal" +INCLUDE "gfx/pokemon/golduck/normal.pal" +INCLUDE "gfx/pokemon/golduck/shiny.pal" +INCLUDE "gfx/pokemon/mankey/normal.pal" +INCLUDE "gfx/pokemon/mankey/shiny.pal" +INCLUDE "gfx/pokemon/primeape/normal.pal" +INCLUDE "gfx/pokemon/primeape/shiny.pal" +INCLUDE "gfx/pokemon/growlithe/normal.pal" +INCLUDE "gfx/pokemon/growlithe/shiny.pal" +INCLUDE "gfx/pokemon/arcanine/normal.pal" +INCLUDE "gfx/pokemon/arcanine/shiny.pal" +INCLUDE "gfx/pokemon/poliwag/normal.pal" +INCLUDE "gfx/pokemon/poliwag/shiny.pal" +INCLUDE "gfx/pokemon/poliwhirl/normal.pal" +INCLUDE "gfx/pokemon/poliwhirl/shiny.pal" +INCLUDE "gfx/pokemon/poliwrath/normal.pal" +INCLUDE "gfx/pokemon/poliwrath/shiny.pal" +INCLUDE "gfx/pokemon/abra/normal.pal" +INCLUDE "gfx/pokemon/abra/shiny.pal" +INCLUDE "gfx/pokemon/kadabra/normal.pal" +INCLUDE "gfx/pokemon/kadabra/shiny.pal" +INCLUDE "gfx/pokemon/alakazam/normal.pal" +INCLUDE "gfx/pokemon/alakazam/shiny.pal" +INCLUDE "gfx/pokemon/machop/normal.pal" +INCLUDE "gfx/pokemon/machop/shiny.pal" +INCLUDE "gfx/pokemon/machoke/normal.pal" +INCLUDE "gfx/pokemon/machoke/shiny.pal" +INCLUDE "gfx/pokemon/machamp/normal.pal" +INCLUDE "gfx/pokemon/machamp/shiny.pal" +INCLUDE "gfx/pokemon/bellsprout/normal.pal" +INCLUDE "gfx/pokemon/bellsprout/shiny.pal" +INCLUDE "gfx/pokemon/weepinbell/normal.pal" +INCLUDE "gfx/pokemon/weepinbell/shiny.pal" +INCLUDE "gfx/pokemon/victreebel/normal.pal" +INCLUDE "gfx/pokemon/victreebel/shiny.pal" +INCLUDE "gfx/pokemon/tentacool/normal.pal" +INCLUDE "gfx/pokemon/tentacool/shiny.pal" +INCLUDE "gfx/pokemon/tentacruel/normal.pal" +INCLUDE "gfx/pokemon/tentacruel/shiny.pal" +INCLUDE "gfx/pokemon/geodude/normal.pal" +INCLUDE "gfx/pokemon/geodude/shiny.pal" +INCLUDE "gfx/pokemon/graveler/normal.pal" +INCLUDE "gfx/pokemon/graveler/shiny.pal" +INCLUDE "gfx/pokemon/golem/normal.pal" +INCLUDE "gfx/pokemon/golem/shiny.pal" +INCLUDE "gfx/pokemon/ponyta/normal.pal" +INCLUDE "gfx/pokemon/ponyta/shiny.pal" +INCLUDE "gfx/pokemon/rapidash/normal.pal" +INCLUDE "gfx/pokemon/rapidash/shiny.pal" +INCLUDE "gfx/pokemon/slowpoke/normal.pal" +INCLUDE "gfx/pokemon/slowpoke/shiny.pal" +INCLUDE "gfx/pokemon/slowbro/normal.pal" +INCLUDE "gfx/pokemon/slowbro/shiny.pal" +INCLUDE "gfx/pokemon/magnemite/normal.pal" +INCLUDE "gfx/pokemon/magnemite/shiny.pal" +INCLUDE "gfx/pokemon/magneton/normal.pal" +INCLUDE "gfx/pokemon/magneton/shiny.pal" +INCLUDE "gfx/pokemon/farfetch_d/normal.pal" +INCLUDE "gfx/pokemon/farfetch_d/shiny.pal" +INCLUDE "gfx/pokemon/doduo/normal.pal" +INCLUDE "gfx/pokemon/doduo/shiny.pal" +INCLUDE "gfx/pokemon/dodrio/normal.pal" +INCLUDE "gfx/pokemon/dodrio/shiny.pal" +INCLUDE "gfx/pokemon/seel/normal.pal" +INCLUDE "gfx/pokemon/seel/shiny.pal" +INCLUDE "gfx/pokemon/dewgong/normal.pal" +INCLUDE "gfx/pokemon/dewgong/shiny.pal" +INCLUDE "gfx/pokemon/grimer/normal.pal" +INCLUDE "gfx/pokemon/grimer/shiny.pal" +INCLUDE "gfx/pokemon/muk/normal.pal" +INCLUDE "gfx/pokemon/muk/shiny.pal" +INCLUDE "gfx/pokemon/shellder/normal.pal" +INCLUDE "gfx/pokemon/shellder/shiny.pal" +INCLUDE "gfx/pokemon/cloyster/normal.pal" +INCLUDE "gfx/pokemon/cloyster/shiny.pal" +INCLUDE "gfx/pokemon/gastly/normal.pal" +INCLUDE "gfx/pokemon/gastly/shiny.pal" +INCLUDE "gfx/pokemon/haunter/normal.pal" +INCLUDE "gfx/pokemon/haunter/shiny.pal" +INCLUDE "gfx/pokemon/gengar/normal.pal" +INCLUDE "gfx/pokemon/gengar/shiny.pal" +INCLUDE "gfx/pokemon/onix/normal.pal" +INCLUDE "gfx/pokemon/onix/shiny.pal" +INCLUDE "gfx/pokemon/drowzee/normal.pal" +INCLUDE "gfx/pokemon/drowzee/shiny.pal" +INCLUDE "gfx/pokemon/hypno/normal.pal" +INCLUDE "gfx/pokemon/hypno/shiny.pal" +INCLUDE "gfx/pokemon/krabby/normal.pal" +INCLUDE "gfx/pokemon/krabby/shiny.pal" +INCLUDE "gfx/pokemon/kingler/normal.pal" +INCLUDE "gfx/pokemon/kingler/shiny.pal" +INCLUDE "gfx/pokemon/voltorb/normal.pal" +INCLUDE "gfx/pokemon/voltorb/shiny.pal" +INCLUDE "gfx/pokemon/electrode/normal.pal" +INCLUDE "gfx/pokemon/electrode/shiny.pal" +INCLUDE "gfx/pokemon/exeggcute/normal.pal" +INCLUDE "gfx/pokemon/exeggcute/shiny.pal" +INCLUDE "gfx/pokemon/exeggutor/normal.pal" +INCLUDE "gfx/pokemon/exeggutor/shiny.pal" +INCLUDE "gfx/pokemon/cubone/normal.pal" +INCLUDE "gfx/pokemon/cubone/shiny.pal" +INCLUDE "gfx/pokemon/marowak/normal.pal" +INCLUDE "gfx/pokemon/marowak/shiny.pal" +INCLUDE "gfx/pokemon/hitmonlee/normal.pal" +INCLUDE "gfx/pokemon/hitmonlee/shiny.pal" +INCLUDE "gfx/pokemon/hitmonchan/normal.pal" +INCLUDE "gfx/pokemon/hitmonchan/shiny.pal" +INCLUDE "gfx/pokemon/lickitung/normal.pal" +INCLUDE "gfx/pokemon/lickitung/shiny.pal" +INCLUDE "gfx/pokemon/koffing/normal.pal" +INCLUDE "gfx/pokemon/koffing/shiny.pal" +INCLUDE "gfx/pokemon/weezing/normal.pal" +INCLUDE "gfx/pokemon/weezing/shiny.pal" +INCLUDE "gfx/pokemon/rhyhorn/normal.pal" +INCLUDE "gfx/pokemon/rhyhorn/shiny.pal" +INCLUDE "gfx/pokemon/rhydon/normal.pal" +INCLUDE "gfx/pokemon/rhydon/shiny.pal" +INCLUDE "gfx/pokemon/chansey/normal.pal" +INCLUDE "gfx/pokemon/chansey/shiny.pal" +INCLUDE "gfx/pokemon/tangela/normal.pal" +INCLUDE "gfx/pokemon/tangela/shiny.pal" +INCLUDE "gfx/pokemon/kangaskhan/normal.pal" +INCLUDE "gfx/pokemon/kangaskhan/shiny.pal" +INCLUDE "gfx/pokemon/horsea/normal.pal" +INCLUDE "gfx/pokemon/horsea/shiny.pal" +INCLUDE "gfx/pokemon/seadra/normal.pal" +INCLUDE "gfx/pokemon/seadra/shiny.pal" +INCLUDE "gfx/pokemon/goldeen/normal.pal" +INCLUDE "gfx/pokemon/goldeen/shiny.pal" +INCLUDE "gfx/pokemon/seaking/normal.pal" +INCLUDE "gfx/pokemon/seaking/shiny.pal" +INCLUDE "gfx/pokemon/staryu/normal.pal" +INCLUDE "gfx/pokemon/staryu/shiny.pal" +INCLUDE "gfx/pokemon/starmie/normal.pal" +INCLUDE "gfx/pokemon/starmie/shiny.pal" +INCLUDE "gfx/pokemon/mr__mime/normal.pal" +INCLUDE "gfx/pokemon/mr__mime/shiny.pal" +INCLUDE "gfx/pokemon/scyther/normal.pal" +INCLUDE "gfx/pokemon/scyther/shiny.pal" +INCLUDE "gfx/pokemon/jynx/normal.pal" +INCLUDE "gfx/pokemon/jynx/shiny.pal" +INCLUDE "gfx/pokemon/electabuzz/normal.pal" +INCLUDE "gfx/pokemon/electabuzz/shiny.pal" +INCLUDE "gfx/pokemon/magmar/normal.pal" +INCLUDE "gfx/pokemon/magmar/shiny.pal" +INCLUDE "gfx/pokemon/pinsir/normal.pal" +INCLUDE "gfx/pokemon/pinsir/shiny.pal" +INCLUDE "gfx/pokemon/tauros/normal.pal" +INCLUDE "gfx/pokemon/tauros/shiny.pal" +INCLUDE "gfx/pokemon/magikarp/normal.pal" +INCLUDE "gfx/pokemon/magikarp/shiny.pal" +INCLUDE "gfx/pokemon/gyarados/normal.pal" +INCLUDE "gfx/pokemon/gyarados/shiny.pal" +INCLUDE "gfx/pokemon/lapras/normal.pal" +INCLUDE "gfx/pokemon/lapras/shiny.pal" +INCLUDE "gfx/pokemon/ditto/normal.pal" +INCLUDE "gfx/pokemon/ditto/shiny.pal" +INCLUDE "gfx/pokemon/eevee/normal.pal" +INCLUDE "gfx/pokemon/eevee/shiny.pal" +INCLUDE "gfx/pokemon/vaporeon/normal.pal" +INCLUDE "gfx/pokemon/vaporeon/shiny.pal" +INCLUDE "gfx/pokemon/jolteon/normal.pal" +INCLUDE "gfx/pokemon/jolteon/shiny.pal" +INCLUDE "gfx/pokemon/flareon/normal.pal" +INCLUDE "gfx/pokemon/flareon/shiny.pal" +INCLUDE "gfx/pokemon/porygon/normal.pal" +INCLUDE "gfx/pokemon/porygon/shiny.pal" +INCLUDE "gfx/pokemon/omanyte/normal.pal" +INCLUDE "gfx/pokemon/omanyte/shiny.pal" +INCLUDE "gfx/pokemon/omastar/normal.pal" +INCLUDE "gfx/pokemon/omastar/shiny.pal" +INCLUDE "gfx/pokemon/kabuto/normal.pal" +INCLUDE "gfx/pokemon/kabuto/shiny.pal" +INCLUDE "gfx/pokemon/kabutops/normal.pal" +INCLUDE "gfx/pokemon/kabutops/shiny.pal" +INCLUDE "gfx/pokemon/aerodactyl/normal.pal" +INCLUDE "gfx/pokemon/aerodactyl/shiny.pal" +INCLUDE "gfx/pokemon/snorlax/normal.pal" +INCLUDE "gfx/pokemon/snorlax/shiny.pal" +INCLUDE "gfx/pokemon/articuno/normal.pal" +INCLUDE "gfx/pokemon/articuno/shiny.pal" +INCLUDE "gfx/pokemon/zapdos/normal.pal" +INCLUDE "gfx/pokemon/zapdos/shiny.pal" +INCLUDE "gfx/pokemon/moltres/normal.pal" +INCLUDE "gfx/pokemon/moltres/shiny.pal" +INCLUDE "gfx/pokemon/dratini/normal.pal" +INCLUDE "gfx/pokemon/dratini/shiny.pal" +INCLUDE "gfx/pokemon/dragonair/normal.pal" +INCLUDE "gfx/pokemon/dragonair/shiny.pal" +INCLUDE "gfx/pokemon/dragonite/normal.pal" +INCLUDE "gfx/pokemon/dragonite/shiny.pal" +INCLUDE "gfx/pokemon/mewtwo/normal.pal" +INCLUDE "gfx/pokemon/mewtwo/shiny.pal" +INCLUDE "gfx/pokemon/mew/normal.pal" +INCLUDE "gfx/pokemon/mew/shiny.pal" +INCLUDE "gfx/pokemon/chikorita/normal.pal" +INCLUDE "gfx/pokemon/chikorita/shiny.pal" +INCLUDE "gfx/pokemon/bayleef/normal.pal" +INCLUDE "gfx/pokemon/bayleef/shiny.pal" +INCLUDE "gfx/pokemon/meganium/normal.pal" +INCLUDE "gfx/pokemon/meganium/shiny.pal" +INCLUDE "gfx/pokemon/cyndaquil/normal.pal" +INCLUDE "gfx/pokemon/cyndaquil/shiny.pal" +INCLUDE "gfx/pokemon/quilava/normal.pal" +INCLUDE "gfx/pokemon/quilava/shiny.pal" +INCLUDE "gfx/pokemon/typhlosion/normal.pal" +INCLUDE "gfx/pokemon/typhlosion/shiny.pal" +INCLUDE "gfx/pokemon/totodile/normal.pal" +INCLUDE "gfx/pokemon/totodile/shiny.pal" +INCLUDE "gfx/pokemon/croconaw/normal.pal" +INCLUDE "gfx/pokemon/croconaw/shiny.pal" +INCLUDE "gfx/pokemon/feraligatr/normal.pal" +INCLUDE "gfx/pokemon/feraligatr/shiny.pal" +INCLUDE "gfx/pokemon/sentret/normal.pal" +INCLUDE "gfx/pokemon/sentret/shiny.pal" +INCLUDE "gfx/pokemon/furret/normal.pal" +INCLUDE "gfx/pokemon/furret/shiny.pal" +INCLUDE "gfx/pokemon/hoothoot/normal.pal" +INCLUDE "gfx/pokemon/hoothoot/shiny.pal" +INCLUDE "gfx/pokemon/noctowl/normal.pal" +INCLUDE "gfx/pokemon/noctowl/shiny.pal" +INCLUDE "gfx/pokemon/ledyba/normal.pal" +INCLUDE "gfx/pokemon/ledyba/shiny.pal" +INCLUDE "gfx/pokemon/ledian/normal.pal" +INCLUDE "gfx/pokemon/ledian/shiny.pal" +INCLUDE "gfx/pokemon/spinarak/normal.pal" +INCLUDE "gfx/pokemon/spinarak/shiny.pal" +INCLUDE "gfx/pokemon/ariados/normal.pal" +INCLUDE "gfx/pokemon/ariados/shiny.pal" +INCLUDE "gfx/pokemon/crobat/normal.pal" +INCLUDE "gfx/pokemon/crobat/shiny.pal" +INCLUDE "gfx/pokemon/chinchou/normal.pal" +INCLUDE "gfx/pokemon/chinchou/shiny.pal" +INCLUDE "gfx/pokemon/lanturn/normal.pal" +INCLUDE "gfx/pokemon/lanturn/shiny.pal" +INCLUDE "gfx/pokemon/pichu/normal.pal" +INCLUDE "gfx/pokemon/pichu/shiny.pal" +INCLUDE "gfx/pokemon/cleffa/normal.pal" +INCLUDE "gfx/pokemon/cleffa/shiny.pal" +INCLUDE "gfx/pokemon/igglybuff/normal.pal" +INCLUDE "gfx/pokemon/igglybuff/shiny.pal" +INCLUDE "gfx/pokemon/togepi/normal.pal" +INCLUDE "gfx/pokemon/togepi/shiny.pal" +INCLUDE "gfx/pokemon/togetic/normal.pal" +INCLUDE "gfx/pokemon/togetic/shiny.pal" +INCLUDE "gfx/pokemon/natu/normal.pal" +INCLUDE "gfx/pokemon/natu/shiny.pal" +INCLUDE "gfx/pokemon/xatu/normal.pal" +INCLUDE "gfx/pokemon/xatu/shiny.pal" +INCLUDE "gfx/pokemon/mareep/normal.pal" +INCLUDE "gfx/pokemon/mareep/shiny.pal" +INCLUDE "gfx/pokemon/flaaffy/normal.pal" +INCLUDE "gfx/pokemon/flaaffy/shiny.pal" +INCLUDE "gfx/pokemon/ampharos/normal.pal" +INCLUDE "gfx/pokemon/ampharos/shiny.pal" +INCLUDE "gfx/pokemon/bellossom/normal.pal" +INCLUDE "gfx/pokemon/bellossom/shiny.pal" +INCLUDE "gfx/pokemon/marill/normal.pal" +INCLUDE "gfx/pokemon/marill/shiny.pal" +INCLUDE "gfx/pokemon/azumarill/normal.pal" +INCLUDE "gfx/pokemon/azumarill/shiny.pal" +INCLUDE "gfx/pokemon/sudowoodo/normal.pal" +INCLUDE "gfx/pokemon/sudowoodo/shiny.pal" +INCLUDE "gfx/pokemon/politoed/normal.pal" +INCLUDE "gfx/pokemon/politoed/shiny.pal" +INCLUDE "gfx/pokemon/hoppip/normal.pal" +INCLUDE "gfx/pokemon/hoppip/shiny.pal" +INCLUDE "gfx/pokemon/skiploom/normal.pal" +INCLUDE "gfx/pokemon/skiploom/shiny.pal" +INCLUDE "gfx/pokemon/jumpluff/normal.pal" +INCLUDE "gfx/pokemon/jumpluff/shiny.pal" +INCLUDE "gfx/pokemon/aipom/normal.pal" +INCLUDE "gfx/pokemon/aipom/shiny.pal" +INCLUDE "gfx/pokemon/sunkern/normal.pal" +INCLUDE "gfx/pokemon/sunkern/shiny.pal" +INCLUDE "gfx/pokemon/sunflora/normal.pal" +INCLUDE "gfx/pokemon/sunflora/shiny.pal" +INCLUDE "gfx/pokemon/yanma/normal.pal" +INCLUDE "gfx/pokemon/yanma/shiny.pal" +INCLUDE "gfx/pokemon/wooper/normal.pal" +INCLUDE "gfx/pokemon/wooper/shiny.pal" +INCLUDE "gfx/pokemon/quagsire/normal.pal" +INCLUDE "gfx/pokemon/quagsire/shiny.pal" +INCLUDE "gfx/pokemon/espeon/normal.pal" +INCLUDE "gfx/pokemon/espeon/shiny.pal" +INCLUDE "gfx/pokemon/umbreon/normal.pal" +INCLUDE "gfx/pokemon/umbreon/shiny.pal" +INCLUDE "gfx/pokemon/murkrow/normal.pal" +INCLUDE "gfx/pokemon/murkrow/shiny.pal" +INCLUDE "gfx/pokemon/slowking/normal.pal" +INCLUDE "gfx/pokemon/slowking/shiny.pal" +INCLUDE "gfx/pokemon/misdreavus/normal.pal" +INCLUDE "gfx/pokemon/misdreavus/shiny.pal" +INCLUDE "gfx/pokemon/unown/normal.pal" +INCLUDE "gfx/pokemon/unown/shiny.pal" +INCLUDE "gfx/pokemon/wobbuffet/normal.pal" +INCLUDE "gfx/pokemon/wobbuffet/shiny.pal" +INCLUDE "gfx/pokemon/girafarig/normal.pal" +INCLUDE "gfx/pokemon/girafarig/shiny.pal" +INCLUDE "gfx/pokemon/pineco/normal.pal" +INCLUDE "gfx/pokemon/pineco/shiny.pal" +INCLUDE "gfx/pokemon/forretress/normal.pal" +INCLUDE "gfx/pokemon/forretress/shiny.pal" +INCLUDE "gfx/pokemon/dunsparce/normal.pal" +INCLUDE "gfx/pokemon/dunsparce/shiny.pal" +INCLUDE "gfx/pokemon/gligar/normal.pal" +INCLUDE "gfx/pokemon/gligar/shiny.pal" +INCLUDE "gfx/pokemon/steelix/normal.pal" +INCLUDE "gfx/pokemon/steelix/shiny.pal" +INCLUDE "gfx/pokemon/snubbull/normal.pal" +INCLUDE "gfx/pokemon/snubbull/shiny.pal" +INCLUDE "gfx/pokemon/granbull/normal.pal" +INCLUDE "gfx/pokemon/granbull/shiny.pal" +INCLUDE "gfx/pokemon/qwilfish/normal.pal" +INCLUDE "gfx/pokemon/qwilfish/shiny.pal" +INCLUDE "gfx/pokemon/scizor/normal.pal" +INCLUDE "gfx/pokemon/scizor/shiny.pal" +INCLUDE "gfx/pokemon/shuckle/normal.pal" +INCLUDE "gfx/pokemon/shuckle/shiny.pal" +INCLUDE "gfx/pokemon/heracross/normal.pal" +INCLUDE "gfx/pokemon/heracross/shiny.pal" +INCLUDE "gfx/pokemon/sneasel/normal.pal" +INCLUDE "gfx/pokemon/sneasel/shiny.pal" +INCLUDE "gfx/pokemon/teddiursa/normal.pal" +INCLUDE "gfx/pokemon/teddiursa/shiny.pal" +INCLUDE "gfx/pokemon/ursaring/normal.pal" +INCLUDE "gfx/pokemon/ursaring/shiny.pal" +INCLUDE "gfx/pokemon/slugma/normal.pal" +INCLUDE "gfx/pokemon/slugma/shiny.pal" +INCLUDE "gfx/pokemon/magcargo/normal.pal" +INCLUDE "gfx/pokemon/magcargo/shiny.pal" +INCLUDE "gfx/pokemon/swinub/normal.pal" +INCLUDE "gfx/pokemon/swinub/shiny.pal" +INCLUDE "gfx/pokemon/piloswine/normal.pal" +INCLUDE "gfx/pokemon/piloswine/shiny.pal" +INCLUDE "gfx/pokemon/corsola/normal.pal" +INCLUDE "gfx/pokemon/corsola/shiny.pal" +INCLUDE "gfx/pokemon/remoraid/normal.pal" +INCLUDE "gfx/pokemon/remoraid/shiny.pal" +INCLUDE "gfx/pokemon/octillery/normal.pal" +INCLUDE "gfx/pokemon/octillery/shiny.pal" +INCLUDE "gfx/pokemon/delibird/normal.pal" +INCLUDE "gfx/pokemon/delibird/shiny.pal" +INCLUDE "gfx/pokemon/mantine/normal.pal" +INCLUDE "gfx/pokemon/mantine/shiny.pal" +INCLUDE "gfx/pokemon/skarmory/normal.pal" +INCLUDE "gfx/pokemon/skarmory/shiny.pal" +INCLUDE "gfx/pokemon/houndour/normal.pal" +INCLUDE "gfx/pokemon/houndour/shiny.pal" +INCLUDE "gfx/pokemon/houndoom/normal.pal" +INCLUDE "gfx/pokemon/houndoom/shiny.pal" +INCLUDE "gfx/pokemon/kingdra/normal.pal" +INCLUDE "gfx/pokemon/kingdra/shiny.pal" +INCLUDE "gfx/pokemon/phanpy/normal.pal" +INCLUDE "gfx/pokemon/phanpy/shiny.pal" +INCLUDE "gfx/pokemon/donphan/normal.pal" +INCLUDE "gfx/pokemon/donphan/shiny.pal" +INCLUDE "gfx/pokemon/porygon2/normal.pal" +INCLUDE "gfx/pokemon/porygon2/shiny.pal" +INCLUDE "gfx/pokemon/stantler/normal.pal" +INCLUDE "gfx/pokemon/stantler/shiny.pal" +INCLUDE "gfx/pokemon/smeargle/normal.pal" +INCLUDE "gfx/pokemon/smeargle/shiny.pal" +INCLUDE "gfx/pokemon/tyrogue/normal.pal" +INCLUDE "gfx/pokemon/tyrogue/shiny.pal" +INCLUDE "gfx/pokemon/hitmontop/normal.pal" +INCLUDE "gfx/pokemon/hitmontop/shiny.pal" +INCLUDE "gfx/pokemon/smoochum/normal.pal" +INCLUDE "gfx/pokemon/smoochum/shiny.pal" +INCLUDE "gfx/pokemon/elekid/normal.pal" +INCLUDE "gfx/pokemon/elekid/shiny.pal" +INCLUDE "gfx/pokemon/magby/normal.pal" +INCLUDE "gfx/pokemon/magby/shiny.pal" +INCLUDE "gfx/pokemon/miltank/normal.pal" +INCLUDE "gfx/pokemon/miltank/shiny.pal" +INCLUDE "gfx/pokemon/blissey/normal.pal" +INCLUDE "gfx/pokemon/blissey/shiny.pal" +INCLUDE "gfx/pokemon/raikou/normal.pal" +INCLUDE "gfx/pokemon/raikou/shiny.pal" +INCLUDE "gfx/pokemon/entei/normal.pal" +INCLUDE "gfx/pokemon/entei/shiny.pal" +INCLUDE "gfx/pokemon/suicune/normal.pal" +INCLUDE "gfx/pokemon/suicune/shiny.pal" +INCLUDE "gfx/pokemon/larvitar/normal.pal" +INCLUDE "gfx/pokemon/larvitar/shiny.pal" +INCLUDE "gfx/pokemon/pupitar/normal.pal" +INCLUDE "gfx/pokemon/pupitar/shiny.pal" +INCLUDE "gfx/pokemon/tyranitar/normal.pal" +INCLUDE "gfx/pokemon/tyranitar/shiny.pal" +INCLUDE "gfx/pokemon/lugia/normal.pal" +INCLUDE "gfx/pokemon/lugia/shiny.pal" +INCLUDE "gfx/pokemon/ho_oh/normal.pal" +INCLUDE "gfx/pokemon/ho_oh/shiny.pal" +INCLUDE "gfx/pokemon/celebi/normal.pal" +INCLUDE "gfx/pokemon/celebi/shiny.pal" ; 252 RGB 30, 26, 11 @@ -522,12 +522,8 @@ CelebiShinyPalette: INCLUDE "gfx/pokemon/celebi/shiny.pal" RGB 30, 26, 11 RGB 23, 16, 00 -; egg - RGB 30, 26, 11 - RGB 23, 16, 00 -; egg shiny - RGB 30, 26, 11 - RGB 23, 16, 00 +INCLUDE "gfx/pokemon/egg/normal.pal" +INCLUDE "gfx/pokemon/egg/shiny.pal" ; 254 RGB 30, 26, 11 diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index 2f13e5d6..b21729f8 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -6,69 +6,69 @@ TrainerPalettes: PlayerPalette: ; Chris uses the same colors as Cal INCLUDE "gfx/trainers/cal.pal" -FalknerPalette: INCLUDE "gfx/trainers/falkner.pal" -WhitneyPalette: INCLUDE "gfx/trainers/whitney.pal" -BugsyPalette: INCLUDE "gfx/trainers/bugsy.pal" -MortyPalette: INCLUDE "gfx/trainers/morty.pal" -PrycePalette: INCLUDE "gfx/trainers/pryce.pal" -JasminePalette: INCLUDE "gfx/trainers/jasmine.pal" -ChuckPalette: INCLUDE "gfx/trainers/chuck.pal" -ClairPalette: INCLUDE "gfx/trainers/clair.pal" -Rival1Palette: INCLUDE "gfx/trainers/rival1.pal" -PokemonProfPalette: INCLUDE "gfx/trainers/oak.pal" -WillPalette: INCLUDE "gfx/trainers/will.pal" -CalPalette: INCLUDE "gfx/trainers/cal.pal" -BrunoPalette: INCLUDE "gfx/trainers/bruno.pal" -KarenPalette: INCLUDE "gfx/trainers/karen.pal" -KogaPalette: INCLUDE "gfx/trainers/koga.pal" -ChampionPalette: INCLUDE "gfx/trainers/champion.pal" -BrockPalette: INCLUDE "gfx/trainers/brock.pal" -MistyPalette: INCLUDE "gfx/trainers/misty.pal" -LtSurgePalette: INCLUDE "gfx/trainers/lt_surge.pal" -ScientistPalette: INCLUDE "gfx/trainers/scientist.pal" -ErikaPalette: INCLUDE "gfx/trainers/erika.pal" -YoungsterPalette: INCLUDE "gfx/trainers/youngster.pal" -SchoolboyPalette: INCLUDE "gfx/trainers/schoolboy.pal" -BirdKeeperPalette: INCLUDE "gfx/trainers/bird_keeper.pal" -LassPalette: INCLUDE "gfx/trainers/lass.pal" -JaninePalette: INCLUDE "gfx/trainers/janine.pal" -CooltrainermPalette: INCLUDE "gfx/trainers/cooltrainer_m.pal" -CooltrainerfPalette: INCLUDE "gfx/trainers/cooltrainer_f.pal" -BeautyPalette: INCLUDE "gfx/trainers/beauty.pal" -PokemaniacPalette: INCLUDE "gfx/trainers/pokemaniac.pal" -GruntmPalette: INCLUDE "gfx/trainers/grunt_m.pal" -GentlemanPalette: INCLUDE "gfx/trainers/gentleman.pal" -SkierPalette: INCLUDE "gfx/trainers/skier.pal" -TeacherPalette: INCLUDE "gfx/trainers/teacher.pal" -SabrinaPalette: INCLUDE "gfx/trainers/sabrina.pal" -BugCatcherPalette: INCLUDE "gfx/trainers/bug_catcher.pal" -FisherPalette: INCLUDE "gfx/trainers/fisher.pal" -SwimmermPalette: INCLUDE "gfx/trainers/swimmer_m.pal" -SwimmerfPalette: INCLUDE "gfx/trainers/swimmer_f.pal" -SailorPalette: INCLUDE "gfx/trainers/sailor.pal" -SuperNerdPalette: INCLUDE "gfx/trainers/super_nerd.pal" -Rival2Palette: INCLUDE "gfx/trainers/rival2.pal" -GuitaristPalette: INCLUDE "gfx/trainers/guitarist.pal" -HikerPalette: INCLUDE "gfx/trainers/hiker.pal" -BikerPalette: INCLUDE "gfx/trainers/biker.pal" -BlainePalette: INCLUDE "gfx/trainers/blaine.pal" -BurglarPalette: INCLUDE "gfx/trainers/burglar.pal" -FirebreatherPalette: INCLUDE "gfx/trainers/firebreather.pal" -JugglerPalette: INCLUDE "gfx/trainers/juggler.pal" -BlackbeltTPalette: INCLUDE "gfx/trainers/blackbelt_t.pal" -ExecutivemPalette: INCLUDE "gfx/trainers/executive_m.pal" -PsychicTPalette: INCLUDE "gfx/trainers/psychic_t.pal" -PicnickerPalette: INCLUDE "gfx/trainers/picnicker.pal" -CamperPalette: INCLUDE "gfx/trainers/camper.pal" -ExecutivefPalette: INCLUDE "gfx/trainers/executive_f.pal" -SagePalette: INCLUDE "gfx/trainers/sage.pal" -MediumPalette: INCLUDE "gfx/trainers/medium.pal" -BoarderPalette: INCLUDE "gfx/trainers/boarder.pal" -PokefanmPalette: INCLUDE "gfx/trainers/pokefan_m.pal" -KimonoGirlPalette: INCLUDE "gfx/trainers/kimono_girl.pal" -TwinsPalette: INCLUDE "gfx/trainers/twins.pal" -PokefanfPalette: INCLUDE "gfx/trainers/pokefan_f.pal" -RedPalette: INCLUDE "gfx/trainers/red.pal" -BluePalette: INCLUDE "gfx/trainers/blue.pal" -OfficerPalette: INCLUDE "gfx/trainers/officer.pal" -GruntfPalette: INCLUDE "gfx/trainers/grunt_f.pal" +INCLUDE "gfx/trainers/falkner.pal" +INCLUDE "gfx/trainers/whitney.pal" +INCLUDE "gfx/trainers/bugsy.pal" +INCLUDE "gfx/trainers/morty.pal" +INCLUDE "gfx/trainers/pryce.pal" +INCLUDE "gfx/trainers/jasmine.pal" +INCLUDE "gfx/trainers/chuck.pal" +INCLUDE "gfx/trainers/clair.pal" +INCLUDE "gfx/trainers/rival1.pal" +INCLUDE "gfx/trainers/oak.pal" +INCLUDE "gfx/trainers/will.pal" +INCLUDE "gfx/trainers/cal.pal" +INCLUDE "gfx/trainers/bruno.pal" +INCLUDE "gfx/trainers/karen.pal" +INCLUDE "gfx/trainers/koga.pal" +INCLUDE "gfx/trainers/champion.pal" +INCLUDE "gfx/trainers/brock.pal" +INCLUDE "gfx/trainers/misty.pal" +INCLUDE "gfx/trainers/lt_surge.pal" +INCLUDE "gfx/trainers/scientist.pal" +INCLUDE "gfx/trainers/erika.pal" +INCLUDE "gfx/trainers/youngster.pal" +INCLUDE "gfx/trainers/schoolboy.pal" +INCLUDE "gfx/trainers/bird_keeper.pal" +INCLUDE "gfx/trainers/lass.pal" +INCLUDE "gfx/trainers/janine.pal" +INCLUDE "gfx/trainers/cooltrainer_m.pal" +INCLUDE "gfx/trainers/cooltrainer_f.pal" +INCLUDE "gfx/trainers/beauty.pal" +INCLUDE "gfx/trainers/pokemaniac.pal" +INCLUDE "gfx/trainers/grunt_m.pal" +INCLUDE "gfx/trainers/gentleman.pal" +INCLUDE "gfx/trainers/skier.pal" +INCLUDE "gfx/trainers/teacher.pal" +INCLUDE "gfx/trainers/sabrina.pal" +INCLUDE "gfx/trainers/bug_catcher.pal" +INCLUDE "gfx/trainers/fisher.pal" +INCLUDE "gfx/trainers/swimmer_m.pal" +INCLUDE "gfx/trainers/swimmer_f.pal" +INCLUDE "gfx/trainers/sailor.pal" +INCLUDE "gfx/trainers/super_nerd.pal" +INCLUDE "gfx/trainers/rival2.pal" +INCLUDE "gfx/trainers/guitarist.pal" +INCLUDE "gfx/trainers/hiker.pal" +INCLUDE "gfx/trainers/biker.pal" +INCLUDE "gfx/trainers/blaine.pal" +INCLUDE "gfx/trainers/burglar.pal" +INCLUDE "gfx/trainers/firebreather.pal" +INCLUDE "gfx/trainers/juggler.pal" +INCLUDE "gfx/trainers/blackbelt_t.pal" +INCLUDE "gfx/trainers/executive_m.pal" +INCLUDE "gfx/trainers/psychic_t.pal" +INCLUDE "gfx/trainers/picnicker.pal" +INCLUDE "gfx/trainers/camper.pal" +INCLUDE "gfx/trainers/executive_f.pal" +INCLUDE "gfx/trainers/sage.pal" +INCLUDE "gfx/trainers/medium.pal" +INCLUDE "gfx/trainers/boarder.pal" +INCLUDE "gfx/trainers/pokefan_m.pal" +INCLUDE "gfx/trainers/kimono_girl.pal" +INCLUDE "gfx/trainers/twins.pal" +INCLUDE "gfx/trainers/pokefan_f.pal" +INCLUDE "gfx/trainers/red.pal" +INCLUDE "gfx/trainers/blue.pal" +INCLUDE "gfx/trainers/officer.pal" +INCLUDE "gfx/trainers/grunt_f.pal" diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index b60acac8..a39ab794 100755 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1237,7 +1237,11 @@ PartyMenuOBPals: INCLUDE "gfx/stats/party_menu_ob.pal" GSTitleBGPals: -INCLUDE "gfx/title/title_bg.pal" +IF DEF(_GOLD) +INCLUDE "gfx/title/title_bg_gold.pal" +ELIF DEF(_SILVER) +INCLUDE "gfx/title/title_bg_silver.pal" +ENDC GSTitleOBPals: INCLUDE "gfx/title/title_fg.pal" @@ -1249,4 +1253,8 @@ BetaPokerPals: INCLUDE "gfx/beta_poker/beta_poker.pal" SlotMachinePals: -INCLUDE "gfx/slots/slots.pal" +IF DEF(_GOLD) +INCLUDE "gfx/slots/slots_gold.pal" +ELIF DEF(_SILVER) +INCLUDE "gfx/slots/slots_silver.pal" +ENDC diff --git a/gfx/font/font_inversed.1bpp b/gfx/font/font_inversed.1bpp new file mode 100644 index 00000000..39a7e73d --- /dev/null +++ b/gfx/font/font_inversed.1bpp @@ -0,0 +1 @@ +}}{{}}ý{}}}{ýa}}}}}}}www{woO7{}}9Um}}}}=]muy}ǻ}}}}}ǻ}}u}}w{}{}}}}}}}}}}mU99}99}߿ûýmmmmýÿ}mmU;߁}}ǻ}}}}}}ûý=}7w?i?l?a?A?] o uu'Www1ϗͥ3?ýǫmǻߏߏ߿ǻdz999 9Ó39?99999999
\ No newline at end of file diff --git a/gfx/font/font_inversed.png b/gfx/font/font_inversed.png Binary files differnew file mode 100644 index 00000000..519339f3 --- /dev/null +++ b/gfx/font/font_inversed.png diff --git a/gfx/pokemon/egg/front.png b/gfx/pokemon/egg/front.png Binary files differindex 0642c28c..e28f5892 100644 --- a/gfx/pokemon/egg/front.png +++ b/gfx/pokemon/egg/front.png diff --git a/gfx/pokemon/egg/normal.pal b/gfx/pokemon/egg/normal.pal new file mode 100644 index 00000000..a24d6f55 --- /dev/null +++ b/gfx/pokemon/egg/normal.pal @@ -0,0 +1,2 @@ + RGB 30, 26, 11 + RGB 23, 16, 00 diff --git a/gfx/pokemon/egg/shiny.pal b/gfx/pokemon/egg/shiny.pal new file mode 100644 index 00000000..a24d6f55 --- /dev/null +++ b/gfx/pokemon/egg/shiny.pal @@ -0,0 +1,2 @@ + RGB 30, 26, 11 + RGB 23, 16, 00 diff --git a/gfx/slots/slots.pal b/gfx/slots/slots.pal deleted file mode 100644 index 0121d294..00000000 --- a/gfx/slots/slots.pal +++ /dev/null @@ -1,162 +0,0 @@ -IF DEF(_GOLD) - RGB 31, 31, 31 - RGB 24, 25, 28 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 10, 06 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 15, 31, 00 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 15, 31 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 15, 21, 31 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 11 - RGB 31, 31, 06 - RGB 24, 24, 09 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 16, 19, 29 - RGB 25, 22, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 30, 10, 06 - RGB 31, 00, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 12, 25, 01 - RGB 05, 14, 00 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 12, 25, 01 - RGB 30, 10, 06 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 06 - RGB 20, 15, 03 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 06 - RGB 15, 21, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 06 - RGB 20, 15, 03 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 24, 21 - RGB 31, 13, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - RGB 00, 00, 00 - -ELIF DEF(_SILVER) - RGB 31, 31, 31 - RGB 25, 26, 14 - RGB 20, 17, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 30, 10, 6 - RGB 20, 17, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 15, 31, 0 - RGB 20, 17, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 31, 15, 31 - RGB 20, 17, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 15, 21, 31 - RGB 20, 17, 31 - RGB 0, 0, 0 - - RGB 31, 31, 11 - RGB 31, 31, 6 - RGB 20, 17, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 16, 19, 29 - RGB 25, 22, 0 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 30, 10, 6 - RGB 31, 0, 0 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 12, 25, 1 - RGB 5, 14, 0 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 12, 25, 1 - RGB 30, 10, 6 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 31, 31, 6 - RGB 20, 15, 3 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 31, 31, 6 - RGB 15, 21, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 31, 31, 6 - RGB 20, 15, 3 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 31, 24, 21 - RGB 31, 13, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 0, 0, 0 - RGB 0, 0, 0 -ENDC diff --git a/gfx/slots/slots_gold.pal b/gfx/slots/slots_gold.pal new file mode 100644 index 00000000..0eec479f --- /dev/null +++ b/gfx/slots/slots_gold.pal @@ -0,0 +1,79 @@ + RGB 31, 31, 31 + RGB 24, 25, 28 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 10, 06 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 31, 00 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 15, 31 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 21, 31 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 11 + RGB 31, 31, 06 + RGB 24, 24, 09 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 16, 19, 29 + RGB 25, 22, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 10, 06 + RGB 31, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 30, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 20, 15, 03 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 15, 21, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 20, 15, 03 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 24, 21 + RGB 31, 13, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 diff --git a/gfx/slots/slots_silver.pal b/gfx/slots/slots_silver.pal new file mode 100644 index 00000000..1e935af0 --- /dev/null +++ b/gfx/slots/slots_silver.pal @@ -0,0 +1,79 @@ + RGB 31, 31, 31 + RGB 25, 26, 14 + RGB 20, 17, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 10, 06 + RGB 20, 17, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 31, 00 + RGB 20, 17, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 15, 31 + RGB 20, 17, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 15, 21, 31 + RGB 20, 17, 31 + RGB 00, 00, 00 + + RGB 31, 31, 11 + RGB 31, 31, 06 + RGB 20, 17, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 16, 19, 29 + RGB 25, 22, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 30, 10, 06 + RGB 31, 00, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 30, 10, 06 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 20, 15, 03 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 15, 21, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 06 + RGB 20, 15, 03 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 24, 21 + RGB 31, 13, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 00, 00, 00 + RGB 00, 00, 00 diff --git a/gfx/title/title_bg.pal b/gfx/title/title_bg.pal deleted file mode 100644 index c1e2690f..00000000 --- a/gfx/title/title_bg.pal +++ /dev/null @@ -1,52 +0,0 @@ -IF DEF(_GOLD) - RGB 31, 31, 31 - RGB 18, 23, 31 - RGB 15, 20, 31 - RGB 0, 0, 0 - - RGB 31, 21, 0 - RGB 12, 14, 12 - RGB 15, 20, 31 - RGB 0, 0, 17 - - RGB 31, 31, 31 - RGB 31, 0, 0 - RGB 15, 20, 31 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 29, 25, 0 - RGB 15, 20, 31 - RGB 17, 10, 1 - - RGB 31, 31, 31 - RGB 23, 26, 31 - RGB 18, 23, 31 - RGB 0, 0, 0 - -ELIF DEF(_SILVER) - RGB 31, 31, 31 - RGB 0, 12, 15 - RGB 4, 8, 21 - RGB 0, 0, 0 - - RGB 31, 21, 0 - RGB 15, 17, 15 - RGB 4, 8, 21 - RGB 0, 0, 17 - - RGB 31, 31, 31 - RGB 31, 0, 0 - RGB 4, 8, 21 - RGB 0, 0, 0 - - RGB 31, 31, 31 - RGB 24, 23, 25 - RGB 4, 8, 21 - RGB 8, 8, 9 - - RGB 31, 31, 31 - RGB 5, 10, 11 - RGB 0, 12, 15 - RGB 0, 0, 0 -ENDC diff --git a/gfx/title/title_bg_gold.pal b/gfx/title/title_bg_gold.pal new file mode 100644 index 00000000..88be368c --- /dev/null +++ b/gfx/title/title_bg_gold.pal @@ -0,0 +1,24 @@ + RGB 31, 31, 31 + RGB 18, 23, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 21, 00 + RGB 12, 14, 12 + RGB 15, 20, 31 + RGB 00, 00, 17 + + RGB 31, 31, 31 + RGB 31, 00, 00 + RGB 15, 20, 31 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 29, 25, 00 + RGB 15, 20, 31 + RGB 17, 10, 01 + + RGB 31, 31, 31 + RGB 23, 26, 31 + RGB 18, 23, 31 + RGB 00, 00, 00 diff --git a/gfx/title/title_bg_silver.pal b/gfx/title/title_bg_silver.pal new file mode 100644 index 00000000..9103edab --- /dev/null +++ b/gfx/title/title_bg_silver.pal @@ -0,0 +1,24 @@ + RGB 31, 31, 31 + RGB 00, 12, 15 + RGB 04, 08, 21 + RGB 00, 00, 00 + + RGB 31, 21, 00 + RGB 15, 17, 15 + RGB 04, 08, 21 + RGB 00, 00, 17 + + RGB 31, 31, 31 + RGB 31, 00, 00 + RGB 04, 08, 21 + RGB 00, 00, 00 + + RGB 31, 31, 31 + RGB 24, 23, 25 + RGB 04, 08, 21 + RGB 08, 08, 09 + + RGB 31, 31, 31 + RGB 05, 10, 11 + RGB 00, 12, 15 + RGB 00, 00, 00 diff --git a/layout.link b/layout.link index 7b3e185b..984869b6 100644 --- a/layout.link +++ b/layout.link @@ -40,14 +40,11 @@ ROMX $04 ROMX $05 "bank5" ROMX $06 - org $4000 "bank6" ROMX $07 - org $4000 "bank7" "Extra Songs 1" ROMX $08 - org $4000 "bank8" "Egg Moves" ROMX $09 @@ -68,7 +65,6 @@ ROMX $10 "bank10" "Evolutions and Attacks" ROMX $11 - org $4000 "bank11" ROMX $12 org $4000 @@ -104,10 +100,8 @@ ROMX $20 "Trainer Pic Pointers" "Pics 13" ROMX $21 - org $4000 "bank21" ROMX $23 - org $4000 "bank23" ROMX $24 "bank24" @@ -115,7 +109,6 @@ ROMX $25 "Maps" "Events" ROMX $26 - org $4000 "bank26" ROMX $2a "Map Blocks 1" @@ -132,22 +125,18 @@ ROMX $31 org $7a40 "bank31_2" ROMX $32 - org $4000 "bank32" ROMX $33 "Move Animations" "Extra Songs 2" ROMX $36 - org $4000 - "bank36" + "Font Inversed" ROMX $37 "Map Blocks 3" "bank37_2" ROMX $38 - org $4000 "bank38" ROMX $39 - org $4000 "bank39" ROMX $3a "Audio" @@ -161,13 +150,10 @@ ROMX $3c ROMX $3d "Songs 4" ROMX $3e - org $4000 "bank3e" ROMX $3f - org $4000 "bank3f" ROMX $40 - org $4000 "bank40" ROMX $41 "bank41" @@ -256,7 +242,6 @@ ROMX $6d ROMX $6e "Item Descriptions" ROMX $70 - org $4000 "bank70" ROMX $7f org $7df8 @@ -476,6 +476,7 @@ INCBIN "gfx/pokemon/egg/front.2bpp.lz" SECTION "bank21", ROMX +Printer_StartTransmission:: dr $84000, $842db _PrinterReceive:: dr $842db, $84560 @@ -648,6 +649,7 @@ GiveANickname_YesNo:: SECTION "bank32", ROMX +ExecuteBGEffects:: dr $c8000, $c80d6 DummyPredef2F:: dr $c80d6, $c900a @@ -679,9 +681,10 @@ BattleAnim_Sine_e:: dr $ce6aa, $cfce3 -SECTION "bank36", ROMX +SECTION "Font Inversed", ROMX - dr $d8000, $d8400 +FontInversed: +INCBIN "gfx/font/font_inversed.1bpp" SECTION "bank37_2", ROMX @@ -716,7 +719,8 @@ TilesetForestColl:: SECTION "bank38", ROMX - dr $e0000, $e0002 + ret + ret _Diploma:: dr $e0002, $e081b RotateUnownFrontpic:: @@ -907,6 +911,7 @@ INCLUDE "data/text/battle.asm" SECTION "bank41", ROMX +; Phone scripts and text UnusedPhoneScript:: dr $104000, $104004 MomPhoneCalleeScript:: @@ -1057,6 +1062,7 @@ INCLUDE "data/items/descriptions.asm" SECTION "bank70", ROMX +PrintPage1:: dr $1c0000, $1c0407 TilesetKantoGFX:: dr $1c0407, $1c0a1f @@ -1077,11 +1083,9 @@ _DudeAutoInput_DownA:: TownMap_ConvertLineBreakCharacters:: dr $1c0e24, $1c0e43 PokegearGFX:: - dr $1c0e43, $1c168b - -IF DEF(_SILVER) - dr $1c168b, $1c168c -ENDC + dr $1c0e43, $1c1127 +CreditsStrings:: + dr $1c1127, $1c168c SECTION "Stadium Data", ROMX diff --git a/tools/gfx.py b/tools/gfx.py index b84aa57d..79dd6f61 100644 --- a/tools/gfx.py +++ b/tools/gfx.py @@ -107,6 +107,10 @@ def filepath_rules(filepath): elif name == 'balls': args['width'] = 32 + elif 'gfx/font' in filedir: + if name == 'font_inversed': + args['width'] = 128 + elif 'gfx/icons' in filedir: if name == 'mail_big': args['width'] = 16 |
