From 8403e052b91e6a519d328cf901e0717aacdf3f22 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 10 Jun 2017 12:35:10 -0700 Subject: Various incbins --- data/mon_gfx/mon_billboard_palette_maps_5.asm | 1 - data/mon_gfx/mon_billboard_palettes_6.asm | 102 +++++++++++++++- data/stage_palettes.asm | 166 +++++++++++++++++++++++++- 3 files changed, 264 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/mon_gfx/mon_billboard_palette_maps_5.asm b/data/mon_gfx/mon_billboard_palette_maps_5.asm index def4e62..7cea56e 100755 --- a/data/mon_gfx/mon_billboard_palette_maps_5.asm +++ b/data/mon_gfx/mon_billboard_palette_maps_5.asm @@ -93,4 +93,3 @@ NidoranMBillboardBGPaletteMap: ; 0xb7d68 db $7, $7, $7, $7, $7, $7 db $7, $7, $7, $7, $7, $7 db $7, $7, $7, $7, $7, $7 - dr $b7d80, $b8000 ; 0xb7d80 diff --git a/data/mon_gfx/mon_billboard_palettes_6.asm b/data/mon_gfx/mon_billboard_palettes_6.asm index 1366b36..bbe16b3 100755 --- a/data/mon_gfx/mon_billboard_palettes_6.asm +++ b/data/mon_gfx/mon_billboard_palettes_6.asm @@ -74,4 +74,104 @@ MewBillboardBGPalette2: ; 0xdc768 RGB 31, 18, 24 RGB 0, 10, 31 RGB 0, 0, 0 - dr $dc770, $dc880 + +UnusedPalettes_dc770: ; 0xdc770 + RGB 31, 31, 31 + RGB 31, 23, 7 + RGB 9, 19, 30 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 31, 23, 7 + RGB 9, 19, 30 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + +UnusedData_dc800: ; 0xdc800 + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00 + db $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF + db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF + db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 + db $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00 + db $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF + db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF diff --git a/data/stage_palettes.asm b/data/stage_palettes.asm index 5b701ee..b2bc94c 100755 --- a/data/stage_palettes.asm +++ b/data/stage_palettes.asm @@ -80,7 +80,87 @@ SeelBonusOBJPalette7: ; 0xdc8f8 RGB 20, 20, 20 RGB 8, 8, 8 RGB 0, 0, 0 - dr $dc900, $dc980 + +UnusedPalettes_dc900: ; 0xdc900 + RGB 31, 27, 29 + RGB 31, 31, 31 + RGB 15, 15, 15 + RGB 0, 0, 0 + + RGB 26, 31, 26 + RGB 4, 23, 13 + RGB 0, 13, 4 + RGB 0, 0, 0 + + RGB 25, 29, 31 + RGB 31, 0, 0 + RGB 16, 0, 0 + RGB 0, 0, 0 + + RGB 31, 29, 25 + RGB 31, 29, 0 + RGB 15, 8, 0 + RGB 0, 0, 0 + + RGB 31, 27, 29 + RGB 20, 20, 20 + RGB 8, 8, 8 + RGB 0, 0, 0 + + RGB 31, 27, 29 + RGB 20, 20, 20 + RGB 8, 8, 8 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 8, 8, 8 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 20, 20, 20 + RGB 8, 8, 8 + RGB 0, 0, 0 + + RGB 20, 20, 20 + RGB 31, 31, 31 + RGB 8, 8, 8 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 16, 12, 31 + RGB 8, 4, 16 + RGB 4, 0, 8 + + RGB 20, 20, 20 + RGB 31, 31, 31 + RGB 8, 8, 8 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 31, 21, 25 + RGB 23, 7, 11 + RGB 13, 0, 2 + + RGB 20, 20, 20 + RGB 31, 31, 31 + RGB 8, 8, 8 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 31, 10, 9 + RGB 13, 2, 4 + RGB 4, 0, 2 + + RGB 20, 20, 20 + RGB 31, 31, 31 + RGB 8, 8, 8 + RGB 0, 0, 0 + + RGB 31, 31, 31 + RGB 19, 26, 2 + RGB 3, 13, 0 + RGB 2, 4, 0 StageRedFieldTopPalettes: ; 0xdc980 StageRedFieldTopBGPalette0: ; 0xdc980 @@ -910,8 +990,88 @@ OptionMenuOBJPalette7: ; 0xdce78 RGB 31, 31, 31 RGB 31, 31, 31 -Data_dce80: - dr $dce80, $dcf00 +PokedexPalettes: ; 0xdce80 +PokedexBGPalette0: + RGB 31, 31, 31 + RGB 7, 27, 27 + RGB 0, 22, 0 + RGB 0, 0, 0 +PokedexBGPalette1: + RGB 31, 31, 31 + RGB 7, 27, 27 + RGB 0, 22, 0 + RGB 0, 0, 0 +PokedexBGPalette2: + RGB 31, 31, 31 + RGB 31, 19, 19 + RGB 31, 0, 0 + RGB 0, 0, 0 +PokedexBGPalette3: + RGB 31, 31, 31 + RGB 31, 29, 0 + RGB 31, 0, 0 + RGB 0, 0, 0 +PokedexBGPalette4: + RGB 31, 31, 31 + RGB 23, 23, 31 + RGB 31, 0, 0 + RGB 0, 0, 0 +PokedexBGPalette5: + RGB 31, 31, 31 + RGB 21, 21, 21 + RGB 11, 11, 11 + RGB 0, 0, 0 +PokedexBGPalette6: + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 +PokedexBGPalette7: + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + +PokedexOBJPalette0: + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 19, 19 + RGB 31, 0, 0 +PokedexOBJPalette1: + RGB 31, 31, 31 + RGB 31, 29, 0 + RGB 31, 0, 0 + RGB 0, 0, 0 +PokedexOBJPalette2: + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 29, 0 + RGB 31, 0, 0 +PokedexOBJPalette3: + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 +PokedexOBJPalette4: + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 +PokedexOBJPalette5: + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 +PokedexOBJPalette6: + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 + RGB 31, 31, 31 +PokedexOBJPalette7: + RGB 31, 31, 31 + RGB 31, 19, 19 + RGB 31, 0, 0 + RGB 0, 0, 0 MewtwoBonusPalettes: ; 0xdcf00 MewtwoBonusBGPalette0: ; 0xdcf00 -- cgit v1.2.3