From 5837b8a4b25bca509431895c241cba269ab5f888 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 13 May 2018 12:18:58 -0700 Subject: Move slot billboard palettes into own file --- data/queued_tiledata/billboard.asm | 4 ++-- data/slot_on_billboard_palettes.asm | 11 +++++++++++ main.asm | 12 +----------- 3 files changed, 14 insertions(+), 13 deletions(-) create mode 100755 data/slot_on_billboard_palettes.asm diff --git a/data/queued_tiledata/billboard.asm b/data/queued_tiledata/billboard.asm index f4ac51d..452a9ec 100755 --- a/data/queued_tiledata/billboard.asm +++ b/data/queued_tiledata/billboard.asm @@ -3131,8 +3131,8 @@ SlotOnBillboardBGPaletteData: ; 0x3116a db $10 db $08 ; number of colors db $30 ; OAM palettes - dw SlotOnBillboardBGPalette - db Bank(SlotOnBillboardBGPalette) + dw SlotOnBillboardBGPalettes + db Bank(SlotOnBillboardBGPalettes) db $00 ; terminator SlotOnBillboardBGPaletteMapData: ; 0x31173 diff --git a/data/slot_on_billboard_palettes.asm b/data/slot_on_billboard_palettes.asm new file mode 100755 index 0000000..94d0291 --- /dev/null +++ b/data/slot_on_billboard_palettes.asm @@ -0,0 +1,11 @@ +SlotOnBillboardBGPalettes: +SlotOnBillboardBGPalette1: ; 0xdd198 + RGB 31, 31, 31 + RGB 31, 26, 2 + RGB 31, 3, 0 + RGB 0, 0, 0 +SlotOnBillboardBGPalette2: ; 0xdd1a0 + RGB 31, 31, 31 + RGB 31, 26, 2 + RGB 31, 3, 0 + RGB 0, 0, 0 diff --git a/main.asm b/main.asm index 309276f..b63ad4e 100644 --- a/main.asm +++ b/main.asm @@ -1053,17 +1053,7 @@ INCLUDE "data/stage_palettes.asm" INCLUDE "data/billboard/map_palettes_2.asm" INCLUDE "data/ball_palettes.asm" INCLUDE "data/evolution_trinket_palettes.asm" - -SlotOnBillboardBGPalette: ; 0xdd198 - RGB 31, 31, 31 - RGB 31, 26, 2 - RGB 31, 3, 0 - RGB 0, 0, 0 -PaletteData_dd1a0: ; 0xdd1a0 - RGB 31, 31, 31 - RGB 31, 26, 2 - RGB 31, 3, 0 - RGB 0, 0, 0 +INCLUDE "data/slot_on_billboard_palettes.asm" SECTION "bank39", ROMX -- cgit v1.2.3