diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-13 12:18:58 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-13 12:18:58 -0700 |
| commit | 5837b8a4b25bca509431895c241cba269ab5f888 (patch) | |
| tree | 4b3b85ab10922fc66bf973e2ecb1882b1dfc481a | |
| parent | 802b7e9fc437b16bc5bec8ad25a8c3b3affbe6b8 (diff) | |
Move slot billboard palettes into own file
| -rwxr-xr-x | data/queued_tiledata/billboard.asm | 4 | ||||
| -rwxr-xr-x | data/slot_on_billboard_palettes.asm | 11 | ||||
| -rw-r--r-- | main.asm | 12 |
3 files changed, 14 insertions, 13 deletions
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
@@ -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 |