From 8345c40dcf3d10b9b09acc50bd01754b9d18d3e5 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 4 Jun 2016 10:18:03 -0400 Subject: Resolve incbinned sgb border --- data/sgb_border.asm | 94 ++++++++++++++++++++++++++++++++++++--------- gfx/tilemaps/sgbborder.map | Bin 1792 -> 1792 bytes 2 files changed, 76 insertions(+), 18 deletions(-) diff --git a/data/sgb_border.asm b/data/sgb_border.asm index 401a55e9..694f97b6 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -1,29 +1,87 @@ BorderPalettes: ; 72c39 (1c:6c39) - dr $72c39,$734b9 - ;INCBIN "gfx/tilemaps/sgbborder.map" + INCBIN "gfx/tilemaps/sgbborder.map" - ;ds $100 + ds $100 - ;RGB 30,29,29 ; PAL_SGB1 - ;RGB 25,22,25 - ;RGB 25,17,21 - ;RGB 24,14,12 + RGB 24, 6, 6 + RGB 31, 25, 9 + RGB 25, 10, 10 + RGB 0, 0, 0 - ;ds $18 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 - ;RGB 30,29,29 ; PAL_SGB2 - ;RGB 22,31,16 - ;RGB 27,20,6 - ;RGB 15,15,15 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 - ;ds $18 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 - ;RGB 30,29,29 ; PAL_SGB3 - ;RGB 31,31,17 - ;RGB 18,21,29 - ;RGB 15,15,15 + RGB 18, 24, 18 + RGB 25, 10, 10 + RGB 15, 25, 15 + RGB 0, 0, 0 - ;ds $18 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 6, 31 + RGB 31, 25, 9 + RGB 15, 25, 15 + RGB 0, 0, 0 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 12, 31, 6 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 SGBBorderGraphics: ; 734b9 (1c:74b9) INCBIN "gfx/pokemon_yellow.t6.2bpp" diff --git a/gfx/tilemaps/sgbborder.map b/gfx/tilemaps/sgbborder.map index 4077ed8e..9c97c339 100644 Binary files a/gfx/tilemaps/sgbborder.map and b/gfx/tilemaps/sgbborder.map differ -- cgit v1.2.3