diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-02-07 18:37:54 -0800 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-02-07 18:37:54 -0800 |
| commit | 325234892970f5b4b8779700bd649c52dee23705 (patch) | |
| tree | 4a11488d6dabf6e957f69761160b51978d172872 /main.asm | |
| parent | 2dbfe1598ad4ed800daf6de089ee3b44178acb9a (diff) | |
| parent | 90af5b2a5e802dec7791de3eb4fe9e047f83353b (diff) | |
Merge pull request #107 from yenatch/master
2bpp to png and png to 2bpp
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -4092,7 +4092,12 @@ INCBIN "baserom.gbc",$9a7a,$a51e - $9a7a SGBBorder: INCBIN "gfx/misc/sgb_border.2bpp" -INCBIN "baserom.gbc",$a8be,$c000 - $a8be +INCBIN "baserom.gbc",$a8be,$a8d6 - $a8be + +PokemonPalettes: +INCLUDE "gfx/pics/palette_pointers.asm" + +INCBIN "baserom.gbc",$b0ae,$c000 - $b0ae SECTION "bank3",DATA,BANK[$3] |