diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2021-06-20 12:32:51 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-20 12:32:51 -0400 |
commit | f917febffb80f8c8d1c34eda191b5ec3011a2f77 (patch) | |
tree | a7e80ddf3af1b80d237965fb10488cbfaaae5218 /gfx/gfx.asm | |
parent | d34132455fbd82cb9c55784c023bb2cefe43aac3 (diff) | |
parent | b42d1ca1adc5c299ae7833df2ae0f15d4c68b50b (diff) |
Merge pull request #95 from ZoomTen/super-gameboy
Some work on SGB functions (bank $02)
Diffstat (limited to 'gfx/gfx.asm')
-rw-r--r-- | gfx/gfx.asm | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gfx/gfx.asm b/gfx/gfx.asm index 6af0a86..6e00551 100644 --- a/gfx/gfx.asm +++ b/gfx/gfx.asm @@ -33,16 +33,22 @@ INCBIN "gfx/title/titlebgdecoration.2bpp" SECTION "gfx.asm@SGB GFX", ROMX INCLUDE "data/pokemon/palettes.inc" -INCLUDE "data/super_palettes.inc" +INCLUDE "data/sgb/super_palettes.inc" -Corrupted9e1cGFX: -INCBIN "slack/corrupted_9e1c.2bpp" +AlternateSGBBorderTilemap:: +INCBIN "gfx/sgb/sgb_border_alt.sgb.tilemap" -UnusedSGBBorderGFX:: +AlternateSGBBorderPalettes: +INCLUDE "gfx/sgb/sgb_border_alt.pal" + +AlternateSGBBorderGFX:: INCBIN "gfx/sgb/sgb_border_alt.2bpp" -Corrupteda66cGFX: -INCBIN "slack/corrupted_a66c.2bpp" +SGBBorderTilemap:: +INCBIN "gfx/sgb/sgb_border.sgb.tilemap" + +SGBBorderPalettes: +INCLUDE "gfx/sgb/sgb_border.pal" SGBBorderGFX:: if DEF(GOLD) |