diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-04-13 11:36:28 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-04-13 11:36:28 -0500 |
| commit | 27ec064056f5ae08a7c547224ff8cb5fdcf969b2 (patch) | |
| tree | 8ca02add77343148c3e3f5acc5cf2b15f6c5e6f1 /gfx | |
| parent | 0b0db144356f88c16134571cecb090004796c90c (diff) | |
| parent | 1fd39f7fb9544c74f143d0c54a84aae55ea8365f (diff) | |
Merge pull request #245 from yenatch/master
Picking off small incbins and static labels.
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/pc.2bpp.lz | bin | 0 -> 132 bytes | |||
| -rw-r--r-- | gfx/pc_mail.2bpp | bin | 0 -> 64 bytes | |||
| -rw-r--r-- | gfx/pics.asm | 6 | ||||
| -rw-r--r-- | gfx/pics/palette_pointers.asm | 9 | ||||
| -rw-r--r-- | gfx/slots.tilemap | bin | 0 -> 240 bytes | |||
| -rw-r--r-- | gfx/slots_1.2bpp.lz | bin | 0 -> 384 bytes | |||
| -rw-r--r-- | gfx/slots_2.2bpp.lz | bin | 0 -> 608 bytes | |||
| -rw-r--r-- | gfx/slots_3.2bpp.lz | bin | 0 -> 528 bytes |
8 files changed, 11 insertions, 4 deletions
diff --git a/gfx/pc.2bpp.lz b/gfx/pc.2bpp.lz Binary files differnew file mode 100644 index 000000000..996cfadc9 --- /dev/null +++ b/gfx/pc.2bpp.lz diff --git a/gfx/pc_mail.2bpp b/gfx/pc_mail.2bpp Binary files differnew file mode 100644 index 000000000..9a6d66ab9 --- /dev/null +++ b/gfx/pc_mail.2bpp diff --git a/gfx/pics.asm b/gfx/pics.asm index a83345ecf..8c852ce2d 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -3,19 +3,19 @@ INCLUDE "includes.asm" SECTION "Pic Pointers", ROMX, BANK[PIC_POINTERS] -PicPointers: +PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm" SECTION "Unown Pic Pointers", ROMX, BANK[UNOWN_PIC_POINTERS] -UnownPicPointers: +UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm" SECTION "Trainer Pic Pointers", ROMX, BANK[TRAINER_PIC_POINTERS] -TrainerPicPointers: +TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm" diff --git a/gfx/pics/palette_pointers.asm b/gfx/pics/palette_pointers.asm index 880cc6731..eb8814f22 100644 --- a/gfx/pics/palette_pointers.asm +++ b/gfx/pics/palette_pointers.asm @@ -1,4 +1,11 @@ -PokemonPalettes: ; a8d6 +PokemonPalettes: ; a8ce + +; 000 + RGB 30, 22, 17 + RGB 16, 14, 19 +; 000 shiny + RGB 30, 22, 17 + RGB 16, 14, 19 BulbasaurPalette: INCLUDE "gfx/pics/bulbasaur/normal.pal" BulbasaurShinyPalette: INCLUDE "gfx/pics/bulbasaur/shiny.pal" diff --git a/gfx/slots.tilemap b/gfx/slots.tilemap Binary files differnew file mode 100644 index 000000000..5e920ed54 --- /dev/null +++ b/gfx/slots.tilemap diff --git a/gfx/slots_1.2bpp.lz b/gfx/slots_1.2bpp.lz Binary files differnew file mode 100644 index 000000000..90d3ce139 --- /dev/null +++ b/gfx/slots_1.2bpp.lz diff --git a/gfx/slots_2.2bpp.lz b/gfx/slots_2.2bpp.lz Binary files differnew file mode 100644 index 000000000..638c68055 --- /dev/null +++ b/gfx/slots_2.2bpp.lz diff --git a/gfx/slots_3.2bpp.lz b/gfx/slots_3.2bpp.lz Binary files differnew file mode 100644 index 000000000..858b6e464 --- /dev/null +++ b/gfx/slots_3.2bpp.lz |