diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-09-14 20:43:14 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-09-14 20:43:14 -0400 |
commit | 6ca722e622c34155ab535673b9bf61eb20e92214 (patch) | |
tree | 10dbbc3203e377a8394d1d38ae0b3f5f40258679 | |
parent | f0dbfe7b277b2d5ea24fec3673fdd5c9266795a0 (diff) |
Start extracting color palettes
-rw-r--r-- | gfx/copyright/copyright.pal | 8 | ||||
-rw-r--r-- | gfx/game_select/pokemon_picross_bg.pal | 8 | ||||
-rw-r--r-- | gfx/title/title_bg.pal | 8 | ||||
-rw-r--r-- | gfx/title/title_ob.pal | 8 | ||||
-rw-r--r-- | include/macros.inc | 15 | ||||
-rw-r--r-- | source/bank_05.asm | 2 | ||||
-rw-r--r-- | source/bank_7c.asm | 20 |
7 files changed, 68 insertions, 1 deletions
diff --git a/gfx/copyright/copyright.pal b/gfx/copyright/copyright.pal new file mode 100644 index 0000000..b7a757e --- /dev/null +++ b/gfx/copyright/copyright.pal @@ -0,0 +1,8 @@ + RGB 31,31,31, 09,09,31, 31,31,31, 00,00,00 + RGB 31,31,31, 31,31,31, 31,31,31, 31,31,31 + RGB 31,31,31, 31,31,31, 31,31,31, 31,31,31 + RGB 31,31,31, 31,31,31, 31,31,31, 31,31,31 + RGB 31,31,31, 31,31,31, 31,31,31, 31,31,31 + RGB 31,31,31, 31,31,31, 31,31,31, 31,31,31 + RGB 31,31,31, 31,31,31, 31,31,31, 31,31,31 + RGB 31,31,31, 31,31,31, 31,31,31, 31,31,31 diff --git a/gfx/game_select/pokemon_picross_bg.pal b/gfx/game_select/pokemon_picross_bg.pal new file mode 100644 index 0000000..b1b1b9a --- /dev/null +++ b/gfx/game_select/pokemon_picross_bg.pal @@ -0,0 +1,8 @@ + RGB 31,29,00, 27,00,00, 13,00,00, 00,00,00 + RGB 31,29,00, 06,22,13, 00,15,06, 00,00,00 + RGB 31,31,31, 11,11,11, 27,00,00, 00,00,00 + RGB 31,31,31, 11,11,11, 00,15,06, 00,00,00 + RGB 31,31,31, 27,00,00, 09,09,09, 00,00,00 + RGB 31,31,31, 06,22,13, 09,09,09, 00,00,00 + RGB 31,31,31, 22,22,22, 09,09,09, 00,00,00 + RGB 31,31,31, 06,22,13, 00,15,06, 00,00,00 diff --git a/gfx/title/title_bg.pal b/gfx/title/title_bg.pal new file mode 100644 index 0000000..aff3126 --- /dev/null +++ b/gfx/title/title_bg.pal @@ -0,0 +1,8 @@ + RGB 31,31,00, 23,20,00, 31,00,00, 00,00,00 + RGB 31,31,00, 31,18,00, 27,13,00, 00,00,00 + RGB 31,31,00, 31,31,31, 09,04,00, 00,00,00 + RGB 31,31,31, 08,08,23, 03,03,18, 00,00,00 + RGB 31,31,31, 13,13,28, 03,03,18, 00,00,00 + RGB 31,31,31, 31,18,00, 27,13,00, 00,00,00 + RGB 31,31,00, 23,20,00, 31,18,00, 00,00,00 + RGB 31,31,00, 28,09,06, 18,03,00, 00,00,00 diff --git a/gfx/title/title_ob.pal b/gfx/title/title_ob.pal new file mode 100644 index 0000000..2e415a0 --- /dev/null +++ b/gfx/title/title_ob.pal @@ -0,0 +1,8 @@ + RGB 31,31,31, 31,31,00, 31,00,00, 00,00,00 + RGB 31,31,31, 31,18,00, 27,13,00, 31,31,31 + RGB 31,31,31, 08,08,23, 03,03,18, 31,31,31 + RGB 31,31,31, 31,18,00, 27,13,00, 03,03,18 + RGB 31,31,31, 08,08,23, 03,03,18, 31,18,00 + RGB 31,31,31, 31,31,31, 31,31,31, 31,31,31 + RGB 31,31,31, 31,31,31, 31,31,31, 00,00,00 + RGB 31,31,31, 31,31,31, 31,31,31, 31,31,31 diff --git a/include/macros.inc b/include/macros.inc index 2f4d28d..26165bc 100644 --- a/include/macros.inc +++ b/include/macros.inc @@ -23,6 +23,21 @@ farjp: macro endm +RGB: macro + rept _NARG / 3 + dw palred (\1) + palgreen (\2) + palblue (\3) + shift 3 + endr +endm + +palred EQUS "(1 << 0) *" +palgreen EQUS "(1 << 5) *" +palblue EQUS "(1 << 10) *" + +palettes EQUS "* PALETTE_SIZE" +palette EQUS "+ PALETTE_SIZE *" +color EQUS "+ PAL_COLOR_SIZE *" + tiles EQUS "* $10" diff --git a/source/bank_05.asm b/source/bank_05.asm index 1496d3b..b6db909 100644 --- a/source/bank_05.asm +++ b/source/bank_05.asm @@ -251,7 +251,7 @@ tutorial_scene_01: jp farcall_ret tutorial_data_42c8: - db $08, $00, $00, $e5, $08, $00, $00, $e6, $08, $00, $00, $e7, $08, $00, $00, $e6 , $00 + db $08, $00, $00, $e5, $08, $00, $00, $e6, $08, $00, $00, $e7, $08, $00, $00, $e6, $00 tutorial_scene_02: ld a, $00 diff --git a/source/bank_7c.asm b/source/bank_7c.asm index 325d435..2c5f5da 100644 --- a/source/bank_7c.asm +++ b/source/bank_7c.asm @@ -1,3 +1,5 @@ +INCLUDE "macros.inc" + SECTION "gfx_alphabets", ROMX[$4000], BANK[$7c] gfx_alphabets:: INCBIN "gfx/fonts/alphabets.2bpp" @@ -17,3 +19,21 @@ SECTION "compressed_tilemap_attrmap_album_list", ROMX[$7482], BANK[$7c] compressed_tilemap_attrmap_album_list:: INCBIN "gfx/safari_zone_album/album_list.tilemap_attrmap.xor" .end:: + +SECTION "pal_pokemon_picross_bg", ROMX[$76cc], BANK[$7c] +pal_pokemon_picross_bg:: +INCLUDE "gfx/game_select/pokemon_picross_bg.pal" +.end:: + +SECTION "pal_title_bg, pal_title_ob", ROMX[$7d4c], BANK[$7c] +pal_title_bg:: +INCLUDE "gfx/title/title_bg.pal" +.end:: +pal_title_ob:: +INCLUDE "gfx/title/title_ob.pal" +.end:: + +SECTION "pal_copyright", ROMX[$7f8c], BANK[$7c] +pal_copyright:: +INCLUDE "gfx/copyright/copyright.pal" +.end:: |