From 0670b743021a398689328ef886ccfe3b9d06693b Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 23 Dec 2020 14:34:11 +0000 Subject: Extract Palette data --- src/data/palettes1.asm | 667 +++++++++++++++++++++++++++++++++++++++++++++++++ src/data/palettes2.asm | 297 ++++++++++++++++++++++ src/engine/bank07.asm | 14 +- src/engine/bank20.asm | 340 +++++++++++++------------ src/gfx.asm | 36 ++- src/layout.link | 3 +- 6 files changed, 1182 insertions(+), 175 deletions(-) create mode 100644 src/data/palettes1.asm create mode 100644 src/data/palettes2.asm (limited to 'src') diff --git a/src/data/palettes1.asm b/src/data/palettes1.asm new file mode 100644 index 0000000..26a2da8 --- /dev/null +++ b/src/data/palettes1.asm @@ -0,0 +1,667 @@ +Palette0:: ; b738a (2d:738a) + db 1, $e4, 8 + db $9c, $63, $94, $42, $08, $21, $00, $00 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette1:: ; b73cd (2d:73cd) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $48, $03, $69, $7c, $01, $14 + db $ff, $7f, $48, $03, $e1, $01, $01, $14 + db $ff, $7f, $59, $1a, $cf, $00, $01, $14 + db $ff, $7f, $48, $03, $1f, $00, $01, $14 + db $ff, $7f, $48, $03, $59, $1a, $01, $14 + db $ff, $7f, $bf, $03, $59, $1a, $01, $14 + db $ff, $7f, $59, $1a, $69, $7c, $01, $14 + +Palette2:: ; b740f (2d:740f) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $f9, $7f, $a9, $7e, $b8, $01, $65, $00 + db $9c, $73, $99, $02, $c8, $04, $00, $00 + db $7e, $3f, $b8, $01, $0e, $01, $00, $00 + db $9c, $73, $81, $02, $c8, $04, $00, $00 + db $f9, $7f, $a9, $7e, $e5, $7c, $00, $14 + db $f9, $7f, $a9, $7e, $1f, $7c, $00, $14 + db $f9, $7f, $a9, $7e, $a4, $06, $41, $01 + +Palette3:: ; b7451 (2d:7451) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $df, $57, $fe, $15, $09, $00, $00, $00 + db $bf, $3f, $37, $1e, $c1, $02, $00, $01 + db $ff, $7f, $5f, $53, $19, $0a, $45, $00 + db $bf, $3f, $37, $1e, $76, $19, $c6, $0c + db $ff, $7f, $e8, $7d, $60, $5c, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette4:: ; b7493 (2d:7493) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $b8, $1a, $0b, $15, $00, $00 + db $fb, $5b, $e0, $1b, $a0, $2a, $00, $00 + db $df, $5b, $9c, $01, $ad, $00, $24, $00 + db $ff, $47, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $a4, $06, $41, $01 + db $fb, $5b, $e0, $1b, $b8, $01, $65, $00 + +Palette5:: ; b74d5 (2d:74d5) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $b8, $1a, $0b, $15, $00, $00 + db $fb, $5b, $e0, $1b, $a0, $2a, $00, $00 + db $3b, $5f, $16, $32, $0e, $11, $24, $00 + db $ff, $47, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $a4, $06, $41, $01 + db $ff, $7f, $e0, $1b, $b8, $01, $65, $00 + +Palette6:: ; b7517 (2d:7517) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $b8, $1a, $0b, $15, $00, $00 + db $fb, $5b, $e0, $1b, $a0, $2a, $00, $00 + db $ff, $7f, $e0, $7b, $c0, $7d, $40, $14 + db $ff, $47, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $a4, $06, $41, $01 + db $fb, $5b, $e0, $1b, $b8, $01, $65, $00 + +Palette7:: ; b7559 (2d:7559) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $b8, $1a, $0b, $15, $00, $00 + db $fb, $5b, $e0, $1b, $a0, $2a, $00, $00 + db $ff, $7f, $ff, $03, $9f, $02, $87, $00 + db $ff, $47, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $a4, $06, $41, $01 + db $fb, $5b, $e0, $1b, $b8, $01, $65, $00 + +Palette8:: ; b759b (2d:759b) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $b8, $1a, $0b, $15, $00, $00 + db $fb, $5b, $e0, $1b, $a0, $2a, $00, $00 + db $ff, $7f, $f3, $17, $60, $12, $80, $04 + db $ff, $47, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $a4, $06, $41, $01 + db $fb, $5b, $e0, $1b, $b8, $01, $65, $00 + +Palette9:: ; b75dd (2d:75dd) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $b8, $1a, $0b, $15, $00, $00 + db $fb, $5b, $e0, $1b, $a0, $2a, $00, $00 + db $ff, $7f, $bf, $7c, $14, $7c, $01, $14 + db $ff, $47, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $a4, $06, $41, $01 + db $fb, $5b, $e0, $1b, $b8, $01, $65, $00 + +Palette10:: ; b761f (2d:761f) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $b8, $1a, $0b, $15, $00, $00 + db $fb, $5b, $e0, $1b, $a0, $2a, $00, $00 + db $ff, $7f, $e0, $1b, $e0, $12, $e0, $08 + db $ff, $47, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $a4, $06, $41, $01 + db $fb, $5b, $e0, $1b, $b8, $01, $65, $00 + +Palette11:: ; b7661 (2d:7661) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $b8, $1a, $0b, $15, $00, $00 + db $fb, $5b, $e0, $1b, $a0, $2a, $00, $00 + db $ff, $7f, $9f, $02, $1f, $00, $08, $00 + db $ff, $47, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $5f, $00, $4c, $00 + db $fb, $5b, $e0, $1b, $a4, $06, $41, $01 + db $fb, $5b, $e0, $1b, $b8, $01, $65, $00 + +Palette12:: ; b76a3 (2d:76a3) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $b8, $1a, $0b, $15, $00, $00 + db $fb, $5b, $e0, $1b, $a4, $06, $41, $01 + db $ff, $7f, $9c, $01, $0b, $15, $00, $18 + db $fb, $5b, $e0, $1b, $5f, $00, $4c, $00 + db $ff, $7f, $a9, $7e, $e5, $7c, $00, $14 + db $ff, $7f, $ff, $13, $9c, $01, $86, $00 + db $fb, $5b, $20, $1b, $9c, $01, $00, $18 + +Palette13:: ; b76e5 (2d:76e5) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $da, $26, $ac, $04, $e0, $00 + db $ff, $7f, $52, $62, $a6, $48, $00, $00 + db $f6, $5b, $e5, $03, $60, $0a, $00, $00 + db $ff, $7f, $da, $26, $5f, $00, $ac, $04 + db $f6, $5b, $e5, $03, $4b, $29, $00, $00 + db $f6, $5b, $e5, $03, $28, $21, $5f, $00 + db $ff, $7f, $52, $62, $e5, $67, $00, $18 + +Palette14:: ; b7727 (2d:7727) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $1f, $2e, $0a, $65, $00, $18 + db $ff, $7f, $31, $7f, $c0, $6c, $ff, $03 + db $ff, $7f, $9d, $0e, $b0, $00, $43, $00 + db $00, $00, $1f, $00, $bf, $01, $3f, $0f + db $ff, $7f, $3f, $0f, $5f, $00, $4c, $00 + db $ff, $7f, $3f, $0f, $b4, $01, $43, $00 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette15:: ; b7769 (2d:7769) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $a0, $7e, $03, $7c, $00, $20 + db $ff, $53, $1f, $02, $ff, $7f, $00, $20 + db $ff, $53, $1f, $02, $5f, $00, $00, $20 + db $ff, $7f, $a0, $7e, $5f, $00, $4c, $00 + db $ff, $53, $1f, $02, $e0, $03, $80, $00 + db $ff, $53, $1f, $02, $b8, $01, $65, $00 + db $ff, $7f, $e0, $03, $a4, $06, $41, $01 + +Palette16:: ; b77ab (2d:77ab) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $57, $ff, $12, $6a, $00, $00, $00 + db $ff, $6f, $e0, $7e, $03, $50, $00, $10 + db $ff, $7f, $3c, $02, $1f, $14, $03, $28 + db $ff, $6f, $15, $30, $03, $50, $00, $10 + db $ff, $6f, $15, $30, $e0, $7e, $03, $50 + db $ff, $7f, $3c, $02, $0e, $20, $03, $28 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette17:: ; b77ed (2d:77ed) + db 0, 8 + db $ff, $7b, $94, $42, $08, $21, $00, $00 + db $ff, $43, $a4, $13, $80, $01, $4c, $00 + db $ff, $7f, $a4, $13, $80, $01, $73, $4e + db $1e, $2b, $a4, $13, $80, $01, $4c, $00 + db $ff, $7f, $e0, $1b, $5f, $00, $4c, $00 + db $ff, $03, $8a, $7f, $8a, $7d, $00, $2c + db $df, $7e, $a4, $13, $b8, $01, $4c, $00 + db $1e, $2b, $7b, $1a, $54, $01, $4b, $00 + +Palette18:: ; b782f (2d:782f) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $4f, $be, $02, $17, $01, $00, $00 + db $ff, $7f, $b3, $7d, $00, $7c, $00, $28 + db $ff, $4f, $be, $02, $1f, $00, $0b, $00 + db $ff, $4f, $b3, $7d, $be, $02, $00, $28 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette19:: ; b7871 (2d:7871) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $dc, $7e, $b5, $7d, $0d, $7c, $00, $00 + db $ff, $03, $e0, $03, $00, $7c, $1f, $00 + db $ff, $7f, $9c, $0d, $4b, $04, $24, $04 + db $ff, $7f, $8a, $7f, $40, $22, $00, $08 + db $dc, $7e, $6a, $7d, $82, $7c, $06, $00 + db $dc, $7e, $b5, $7d, $5f, $00, $4c, $00 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette20:: ; b78b3 (2d:78b3) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $5f, $7f, $88, $7e, $00, $70, $00, $14 + db $ff, $63, $7f, $1e, $f0, $1f, $60, $19 + db $ff, $63, $7f, $1e, $1f, $00, $10, $00 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette21:: ; b78f5 (2d:78f5) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $df, $1e, $e0, $02, $41, $01 + db $ff, $57, $df, $1e, $16, $01, $65, $00 + db $ff, $57, $5f, $03, $1f, $7c, $00, $0c + db $ff, $7f, $df, $03, $1f, $00, $02, $00 + db $ff, $7f, $e8, $7f, $e0, $02, $44, $04 + db $ff, $7f, $df, $03, $b8, $01, $02, $00 + db $ff, $5f, $df, $1e, $16, $01, $65, $00 + +Palette22:: ; b7937 (2d:7937) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $9f, $43, $1f, $00, $14, $00, $2b, $10 + db $9f, $43, $1f, $00, $a4, $06, $41, $01 + db $9f, $43, $1f, $00, $b8, $01, $65, $00 + db $ff, $7f, $a9, $7e, $e5, $7c, $00, $14 + db $7e, $3f, $b8, $01, $0e, $01, $00, $00 + db $ff, $7f, $3f, $03, $86, $00, $00, $00 + db $ff, $7f, $97, $01, $86, $00, $02, $00 + +Palette23:: ; b7979 (2d:7979) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $9f, $43, $1f, $00, $14, $00, $2b, $10 + db $9f, $43, $1f, $00, $a4, $06, $41, $01 + db $9f, $43, $1f, $00, $b8, $01, $65, $00 + db $ff, $03, $1f, $00, $4d, $7d, $63, $50 + db $ff, $7f, $97, $01, $e0, $02, $00, $01 + db $ff, $7f, $b9, $02, $1f, $00, $02, $00 + db $ff, $7f, $97, $01, $86, $00, $02, $00 + +Palette24:: ; b79bb (2d:79bb) + db 0, 8 + db $ff, $7f, $94, $42, $08, $21, $00, $00 + db $ff, $7f, $1f, $00, $14, $00, $2b, $10 + db $ff, $7f, $9f, $03, $9f, $1a, $dd, $00 + db $ff, $7f, $0f, $7e, $07, $51, $00, $28 + db $ff, $7f, $0f, $7e, $9f, $03, $00, $28 + db $ff, $7f, $9f, $03, $14, $00, $dd, $00 + db $ff, $7f, $0f, $7e, $1f, $00, $00, $28 + db $ff, $7f, $97, $01, $86, $00, $44, $04 + +Palette25:: ; b79fd (2d:79fd) + db 0, 8 + db $9c, $63, $52, $42, $08, $21, $00, $00 + db $9c, $63, $df, $02, $40, $6d, $00, $0c + db $9c, $63, $1f, $00, $40, $6d, $00, $00 + db $9c, $63, $df, $02, $1f, $00, $00, $00 + db $9c, $63, $fa, $36, $1f, $00, $00, $00 + db $9c, $63, $1f, $02, $40, $6d, $00, $0c + db $9c, $63, $df, $02, $fa, $36, $00, $0c + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette26:: ; b7a3f (2d:7a3f) + db 0, 8 + db $7b, $63, $94, $46, $8c, $29, $a5, $0c + db $7b, $63, $1f, $00, $bf, $01, $00, $7c + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette27:: ; b7a81 (2d:7a81) + db 0, 8 + db $9c, $63, $b5, $42, $4a, $21, $00, $00 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette28:: ; b7ac3 (2d:7ac3) + db 0, 8 + db $7b, $63, $94, $46, $8c, $29, $a5, $0c + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette29:: ; b7b05 (2d:7b05) + db 2, $d3, $e3, 8 + db $c6, $2d, $7e, $63, $e6, $65, $00, $00 + db $c6, $2d, $7e, $63, $be, $49, $00, $00 + db $c6, $2d, $7e, $63, $1c, $17, $00, $00 + db $c6, $2d, $7e, $63, $64, $0e, $00, $00 + db $c6, $2d, $7e, $63, $be, $24, $00, $00 + db $c6, $2d, $7e, $63, $0f, $69, $00, $00 + db $c6, $2d, $7e, $63, $ff, $7f, $00, $00 + db $c6, $2d, $7e, $63, $29, $6d, $00, $00 + +Palette30:: ; b7b49 (2d:7b49) + db 2, $d2, $ff, 8 + db $00, $00, $9c, $63, $65, $1a, $01, $14 + db $00, $00, $9c, $63, $5f, $10, $01, $14 + db $00, $00, $9c, $63, $e7, $7e, $01, $14 + db $00, $00, $9c, $63, $19, $7f, $01, $14 + db $00, $00, $9c, $63, $ff, $03, $01, $14 + db $00, $00, $9c, $63, $5b, $7e, $01, $14 + db $00, $00, $9c, $63, $77, $1d, $01, $14 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette32:: ; b7b8d (2d:7b8d) + db 1, $d2, 1 + db $00, $00, $9c, $63, $9c, $32, $00, $00 + +Palette33:: ; b7b98 (2d:7b98) + db 1, $d2, 1 + db $00, $00, $ff, $7f, $9c, $32, $00, $00 + +Palette34:: ; b7ba3 (2d:7ba3) + db 1, $d2, 1 + db $00, $00, $ff, $03, $bf, $01, $8b, $00 + +Palette35:: ; b7bae (2d:7bae) + db 1, $d2, 1 + db $00, $00, $31, $76, $08, $61, $00, $28 + +Palette36:: ; b7bb9 (2d:7bb9) + db 1, $d2, 1 + db $00, $00, $ff, $5e, $df, $1c, $00, $00 + +Palette37:: ; b7bc4 (2d:7bc4) + db 1, $d2, 1 + db $00, $00, $ff, $7f, $ef, $3d, $00, $00 + +Palette38:: ; b7bcf (2d:7bcf) + db 1, $c2, 1 + db $00, $00, $ff, $7f, $5f, $03, $00, $00 + +Palette39:: ; b7bda (2d:7bda) + db 1, $c2, 1 + db $00, $00, $ff, $7f, $5f, $03, $00, $00 + +Palette40:: ; b7be5 (2d:7be5) + db 1, $d2, 1 + db $00, $00, $ff, $7f, $ff, $03, $00, $00 + +Palette41:: ; b7bf0 (2d:7bf0) + db 1, $c2, 1 + db $00, $00, $ff, $7f, $5f, $03, $00, $00 + +Palette42:: ; b7bfb (2d:7bfb) + db 1, $d2, 1 + db $00, $00, $9e, $37, $3f, $22, $0c, $00 + +Palette43:: ; b7c06 (2d:7c06) + db 1, $d2, 1 + db $00, $00, $9e, $37, $3f, $22, $0c, $00 + +Palette44:: ; b7c11 (2d:7c11) + db 1, $d2, 1 + db $00, $00, $9e, $37, $3f, $22, $0c, $00 + +Palette45:: ; b7c1c (2d:7c1c) + db 1, $e2, 1 + db $f0, $52, $f4, $7f, $c6, $7d, $0e, $7c + +Palette46:: ; b7c27 (2d:7c27) + db 1, $d2, 1 + db $00, $00, $e0, $7f, $e0, $7d, $00, $54 + +Palette47:: ; b7c32 (2d:7c32) + db 1, $92, 1 + db $6b, $2d, $e0, $7f, $e0, $7d, $00, $24 + +Palette48:: ; b7c3d (2d:7c3d) + db 1, $d2, 1 + db $00, $00, $e0, $7f, $e0, $7d, $00, $54 + +Palette49:: ; b7c48 (2d:7c48) + db 1, $d2, 1 + db $00, $00, $ff, $7f, $e0, $7d, $e0, $7d + +Palette50:: ; b7c53 (2d:7c53) + db 1, $e2, 1 + db $00, $00, $87, $7e, $a5, $6d, $20, $20 + +Palette51:: ; b7c5e (2d:7c5e) + db 1, $d2, 1 + db $9c, $63, $ff, $7f, $1f, $20, $07, $0c + +Palette52:: ; b7c69 (2d:7c69) + db 1, $d2, 1 + db $00, $00, $9c, $52, $9c, $31, $8c, $10 + +Palette53:: ; b7c74 (2d:7c74) + db 1, $d2, 1 + db $00, $00, $ff, $5b, $9c, $32, $00, $00 + +Palette54:: ; b7c7f (2d:7c7f) + db 1, $d2, 1 + db $9c, $63, $ff, $7f, $b5, $01, $00, $00 + +Palette55:: ; b7c8a (2d:7c8a) + db 1, $e2, 1 + db $9c, $63, $9f, $01, $1c, $00, $08, $00 + +Palette56:: ; b7c95 (2d:7c95) + db 1, $d2, 1 + db $00, $00, $ff, $7f, $9c, $32, $00, $00 + +Palette57:: ; b7ca0 (2d:7ca0) + db 1, $d2, 1 + db $00, $00, $ff, $4b, $72, $12, $e6, $00 + +Palette58:: ; b7cab (2d:7cab) + db 1, $e2, 1 + db $00, $00, $ff, $4b, $bf, $01, $e6, $00 + +Palette59:: ; b7cb6 (2d:7cb6) + db 1, $d2, 1 + db $00, $00, $ff, $4b, $72, $12, $e6, $00 + +Palette60:: ; b7cc1 (2d:7cc1) + db 1, $d2, 1 + db $00, $00, $9c, $73, $94, $52, $e6, $00 + +Palette61:: ; b7ccc (2d:7ccc) + db 1, $d2, 1 + db $f0, $52, $ff, $03, $9f, $02, $27, $00 + +Palette62:: ; b7cd7 (2d:7cd7) + db 1, $d2, 1 + db $00, $00, $ff, $7f, $94, $42, $e6, $00 + +Palette63:: ; b7ce2 (2d:7ce2) + db 1, $d2, 1 + db $00, $00, $41, $5d, $fa, $4b, $e6, $00 + +Palette64:: ; b7ced (2d:7ced) + db 1, $e2, 1 + db $00, $00, $3c, $7f, $d0, $59, $00, $34 + +Palette65:: ; b7cf8 (2d:7cf8) + db 1, $d2, 1 + db $6b, $2d, $fe, $77, $39, $67, $21, $04 + +Palette66:: ; b7d03 (2d:7d03) + db 1, $d2, 1 + db $6b, $2d, $ff, $7b, $ff, $63, $2a, $01 + +Palette67:: ; b7d0e (2d:7d0e) + db 1, $d2, 1 + db $00, $00, $fa, $4b, $f3, $36, $e6, $00 + +Palette68:: ; b7d19 (2d:7d19) + db 1, $d2, 1 + db $00, $00, $ba, $7f, $0d, $72, $e6, $00 + +Palette69:: ; b7d24 (2d:7d24) + db 1, $d2, 1 + db $00, $00, $fb, $6f, $0d, $72, $e6, $00 + +Palette70:: ; b7d2f (2d:7d2f) + db 1, $d2, 1 + db $6b, $2d, $5f, $7f, $1f, $6e, $0e, $14 + +Palette71:: ; b7d3a (2d:7d3a) + db 1, $d2, 1 + db $6b, $2d, $ff, $7b, $1b, $5e, $00, $08 + +Palette72:: ; b7d45 (2d:7d45) + db 1, $e2, 1 + db $6b, $2d, $ff, $7b, $4b, $29, $00, $08 + +Palette73:: ; b7d50 (2d:7d50) + db 1, $d2, 1 + db $6b, $2d, $ff, $63, $9f, $4b, $4d, $01 + +Palette74:: ; b7d5b (2d:7d5b) + db 1, $d2, 1 + db $6b, $2d, $ff, $7b, $ff, $7b, $45, $00 + +Palette75:: ; b7d66 (2d:7d66) + db 1, $d2, 1 + db $00, $00, $ff, $5f, $5a, $13, $70, $00 + +Palette76:: ; b7d71 (2d:7d71) + db 1, $d2, 1 + db $6b, $2d, $9f, $7f, $df, $76, $13, $31 + +Palette77:: ; b7d7c (2d:7d7c) + db 1, $d2, 1 + db $00, $00, $ff, $5f, $5a, $13, $e6, $00 + +Palette78:: ; b7d87 (2d:7d87) + db 1, $d2, 1 + db $6b, $2d, $ff, $73, $ed, $7a, $61, $21 + +Palette79:: ; b7d92 (2d:7d92) + db 1, $e2, 1 + db $6b, $2d, $fe, $7f, $08, $31, $00, $14 + +Palette80:: ; b7d9d (2d:7d9d) + db 1, $d2, 1 + db $6b, $2d, $bb, $7f, $92, $7e, $88, $28 + +Palette81:: ; b7da8 (2d:7da8) + db 1, $c2, 1 + db $6b, $2d, $ff, $7b, $52, $7b, $00, $0c + +Palette82:: ; b7db3 (2d:7db3) + db 1, $d2, 1 + db $6b, $2d, $ff, $7b, $9f, $10, $4c, $00 + +Palette83:: ; b7dbe (2d:7dbe) + db 1, $d2, 1 + db $6b, $2d, $ff, $6b, $b7, $5a, $63, $0c + +Palette84:: ; b7dc9 (2d:7dc9) + db 1, $d2, 1 + db $00, $00, $ff, $7f, $5a, $13, $e6, $00 + +Palette85:: ; b7dd4 (2d:7dd4) + db 1, $e2, 1 + db $00, $00, $1d, $63, $b1, $14, $e6, $00 + +Palette86:: ; b7ddf (2d:7ddf) + db 1, $e6, 1 + db $6b, $2d, $f9, $5e, $ae, $35, $63, $0c + +Palette87:: ; b7dea (2d:7dea) + db 1, $d2, 1 + db $00, $00, $ff, $1f, $1f, $1b, $6b, $00 + +Palette88:: ; b7df5 (2d:7df5) + db 1, $d2, 1 + db $00, $00, $ff, $7f, $94, $42, $e6, $00 + +Palette89:: ; b7e00 (2d:7e00) + db 1, $e2, 1 + db $9c, $63, $ff, $03, $3f, $02, $69, $00 + +Palette90:: ; b7e0b (2d:7e0b) + db 1, $d2, 1 + db $00, $00, $ff, $7f, $94, $42, $e6, $00 + +Palette91:: ; b7e16 (2d:7e16) + db 1, $e6, 1 + db $10, $52, $9c, $63, $8c, $51, $00, $00 + +Palette92:: ; b7e21 (2d:7e21) + db 1, $e4, 1 + db $9c, $63, $7f, $02, $57, $01, $00, $00 + +Palette93:: ; b7e2c (2d:7e2c) + db 1, $c9, 1 + db $94, $42, $1f, $00, $ff, $03, $00, $00 + +Palette94:: ; b7e37 (2d:7e37) + db 0, 8 + db $00, $00, $01, $00, $02, $00, $03, $00 + db $04, $00, $05, $00, $06, $00, $07, $00 + db $08, $00, $09, $00, $0a, $00, $0b, $00 + db $0c, $00, $0d, $00, $0e, $00, $0f, $00 + db $10, $00, $11, $00, $12, $00, $13, $00 + db $14, $00, $15, $00, $16, $00, $17, $00 + db $18, $00, $19, $00, $1a, $00, $1b, $00 + db $1c, $00, $1d, $00, $1e, $00, $1f, $00 + +Palette95:: ; b7e79 (2d:7e79) + db 0, 8 + db $ff, $7f, $df, $7b, $bf, $77, $9f, $73 + db $7f, $6f, $5f, $6b, $3f, $67, $1f, $63 + db $ff, $5e, $df, $5a, $bf, $56, $9f, $52 + db $7f, $4e, $5f, $4a, $3f, $46, $1f, $42 + db $ff, $3d, $df, $39, $bf, $35, $9f, $31 + db $7f, $2d, $5f, $29, $3f, $25, $1f, $21 + db $ff, $1c, $df, $18, $bf, $14, $9f, $10 + db $7f, $0c, $5f, $08, $3f, $04, $1f, $00 + +Palette96:: ; b7ebb (2d:7ebb) + db 0, 8 + db $00, $00, $20, $00, $40, $00, $60, $00 + db $80, $00, $a0, $00, $c0, $00, $e0, $00 + db $00, $01, $20, $01, $40, $01, $60, $01 + db $80, $01, $a0, $01, $c0, $01, $e0, $01 + db $00, $02, $20, $02, $40, $02, $60, $02 + db $80, $02, $a0, $02, $c0, $02, $e0, $02 + db $00, $03, $20, $03, $40, $03, $60, $03 + db $80, $03, $a0, $03, $c0, $03, $e0, $03 + +Palette97:: ; b7efd (2d:7efd) + db 0, 8 + db $ff, $7f, $fe, $7b, $fd, $77, $fc, $73 + db $fb, $6f, $fa, $6b, $f9, $67, $f8, $63 + db $f7, $5f, $f6, $5b, $f5, $57, $f4, $53 + db $f3, $4f, $f2, $4b, $f1, $47, $f0, $43 + db $ef, $3f, $ee, $3b, $ed, $37, $ec, $33 + db $eb, $2f, $ea, $2b, $e9, $27, $e8, $23 + db $e7, $1f, $e6, $1b, $e5, $17, $e4, $13 + db $e3, $0f, $e2, $0b, $e1, $07, $e0, $03 + +Palette98:: ; b7f3f (2d:7f3f) + db 0, 8 + db $ff, $7f, $1f, $00, $df, $00, $9f, $01 + db $7f, $02, $3f, $03, $ff, $03, $f9, $03 + db $f3, $03, $ec, $03, $e6, $03, $e0, $03 + db $e0, $1b, $e0, $33, $e0, $4f, $e0, $67 + db $e0, $7f, $20, $7f, $60, $7e, $80, $7d + db $c0, $7c, $00, $7c, $06, $7c, $0c, $7c + db $13, $7c, $19, $7c, $1f, $7c, $1f, $64 + db $1f, $4c, $1f, $30, $1f, $18, $00, $00 + +Palette99:: ; b7f81 (2d:7f81) + db 0, 8 + db $ff, $7f, $ef, $3d, $9c, $73, $00, $3c + db $bd, $77, $ad, $35, $ff, $03, $ff, $7f + db $7b, $6f, $6b, $2d, $e0, $7f, $0f, $3c + db $39, $67, $29, $25, $e0, $03, $00, $00 + db $f7, $5e, $e7, $1c, $1f, $7c, $04, $00 + db $b5, $56, $a5, $14, $1f, $00, $80, $00 + db $73, $4e, $63, $0c, $00, $7c, $00, $10 + db $31, $46, $21, $04, $00, $00, $e0, $03 + +Palette101:: ; b7fc3 (2d:7fc3) + db 0, 7 + db $9c, $73, $9c, $03, $1c, $02, $04, $00 + db $9c, $73, $00, $70, $00, $10, $04, $00 + db $9c, $73, $98, $00, $1c, $02, $04, $00 + db $9c, $73, $9c, $03, $98, $00, $04, $00 + db $9c, $73, $84, $01, $1c, $02, $04, $00 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette108:: ; b7ffd (2d:7ffd) + db 1, $e4, 0 diff --git a/src/data/palettes2.asm b/src/data/palettes2.asm new file mode 100644 index 0000000..34bebf1 --- /dev/null +++ b/src/data/palettes2.asm @@ -0,0 +1,297 @@ +Palette100:: ; b8000 (2e:4000) + db 0, 8 + db $ff, $7f, $3f, $13, $a5, $7c, $01, $14 + db $ff, $7f, $3f, $13, $1f, $00, $01, $14 + db $ff, $7f, $5f, $10, $a5, $7c, $01, $14 + db $ff, $7f, $19, $7f, $a5, $7c, $01, $14 + db $ff, $7f, $e7, $7e, $65, $1a, $01, $14 + db $ff, $7f, $5b, $7e, $77, $1d, $01, $14 + db $ff, $7f, $5f, $13, $a5, $7c, $1f, $00 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette102:: ; b8042 (2e:4042) + db 0, 7 + db $9c, $73, $1c, $43, $1c, $11, $04, $00 + db $9c, $73, $80, $72, $00, $70, $00, $20 + db $9c, $73, $04, $32, $1c, $11, $04, $00 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette103:: ; b807c (2e:407c) + db 0, 7 + db $9c, $73, $0c, $73, $80, $61, $00, $20 + db $9c, $73, $80, $70, $80, $61, $00, $20 + db $9c, $73, $9c, $03, $88, $00, $00, $20 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette104:: ; b80b6 (2e:40b6) + db 0, 7 + db $9c, $73, $f5, $7d, $14, $20, $04, $00 + db $9c, $73, $6a, $78, $14, $20, $04, $00 + db $9c, $73, $ff, $18, $0e, $18, $04, $00 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + db $00, $00, $1c, $00, $9c, $01, $9c, $03 + +Palette105:: ; b80f0 (2e:40f0) + db 0, 7 + db $00, $10, $5f, $1e, $e4, $3c, $1f, $03 + db $00, $10, $5f, $1e, $e4, $3c, $9f, $4b + db $00, $10, $2b, $7e, $e4, $3c, $da, $7f + db $00, $10, $5f, $1e, $12, $11, $9f, $4b + db $00, $10, $5f, $1e, $f9, $00, $ff, $7f + db $00, $10, $5f, $1e, $12, $11, $e4, $3c + db $00, $10, $12, $11, $e4, $3c, $1f, $03 + +Palette106:: ; b812a (2e:412a) + db 0, 7 + db $28, $04, $ea, $26, $27, $49, $5f, $03 + db $28, $04, $ea, $26, $c5, $11, $5f, $03 + db $28, $04, $c5, $11, $58, $04, $5a, $6f + db $28, $04, $5a, $6f, $c5, $11, $5f, $03 + db $28, $04, $ea, $26, $c5, $11, $fc, $4f + db $28, $04, $ea, $26, $58, $04, $5a, $6f + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette107:: ; b8164 (2e:4164) + db 0, 7 + db $23, $04, $fe, $52, $92, $31, $d9, $7f + db $00, $18, $fe, $52, $e7, $3c, $7f, $03 + db $00, $18, $fe, $52, $57, $08, $de, $7b + db $23, $04, $fe, $52, $92, $31, $5f, $03 + db $23, $04, $fe, $52, $92, $31, $c6, $3c + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette111:: ; b819e (2e:419e) + db 1, $e4, 8 + db $9c, $63, $94, $42, $08, $21, $00, $00 + db $9c, $63, $1f, $03, $63, $20, $00, $00 + db $9c, $63, $d9, $01, $84, $28, $00, $00 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $9c, $63, $be, $03, $bf, $01, $00, $00 + db $9c, $63, $ff, $7f, $1d, $42, $1d, $00 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette112:: ; b81e1 (2e:41e1) + db 1, $e4, 8 + db $9c, $63, $94, $42, $08, $21, $00, $00 + db $57, $5a, $51, $1c, $84, $1c, $00, $00 + db $9c, $63, $d9, $01, $63, $20, $00, $00 + db $9c, $63, $1f, $03, $63, $20, $00, $00 + db $9c, $63, $be, $03, $bf, $01, $00, $00 + db $9c, $63, $90, $45, $84, $1c, $00, $00 + db $57, $5a, $90, $45, $84, $1c, $00, $00 + db $9c, $63, $1f, $03, $63, $20, $d9, $01 + +Palette113:: ; b8224 (2e:4224) + db 1, $e4, 8 + db $9c, $63, $94, $42, $08, $21, $00, $00 + db $9c, $63, $1f, $03, $63, $20, $00, $00 + db $9c, $63, $d9, $01, $63, $20, $00, $00 + db $63, $20, $1f, $03, $d9, $01, $00, $00 + db $9c, $63, $be, $03, $bf, $01, $00, $00 + db $9c, $63, $1f, $03, $d9, $01, $00, $00 + db $9c, $63, $7f, $03, $1f, $00, $00, $00 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette114:: ; b8267 (2e:4267) + db 2, $e4, $03, 4 + db $00, $00, $ff, $7f, $1d, $42, $1d, $00 + db $00, $00, $e0, $7f, $de, $7b, $00, $74 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette115:: ; b828b (2e:428b) + db 2, $e4, $03, 4 + db $9c, $63, $1f, $00, $e0, $03, $c0, $01 + db $9c, $63, $1f, $00, $bf, $01, $1d, $00 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette116:: ; b82af (2e:42af) + db 2, $d2, $e4, 4 + db $9c, $63, $ff, $7f, $e0, $7f, $a0, $7d + db $9c, $63, $ff, $03, $ff, $03, $1f, $00 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + db $00, $00, $1f, $00, $bf, $01, $ff, $03 + +Palette118:: ; b82d3 (2e:42d3) + db 0, 6 + db $9c, $63, $c4, $53, $08, $22, $00, $00 + db $9c, $63, $7f, $29, $33, $21, $00, $00 + db $9c, $63, $86, $72, $08, $7d, $00, $00 + db $9c, $63, $bf, $02, $b8, $21, $00, $00 + db $9c, $63, $d7, $19, $ef, $01, $00, $00 + db $9c, $63, $7d, $79, $13, $64, $00, $00 + +Palette120:: ; b8305 (2e:4305) + db 0, 1 + db $9c, $73, $14, $43, $80, $01, $20, $00 + +Palette121:: ; b830f (2e:430f) + db 0, 1 + db $18, $73, $0c, $72, $04, $71, $00, $30 + +Palette122:: ; b8319 (2e:4319) + db 0, 1 + db $98, $63, $8c, $32, $84, $21, $80, $00 + +Palette123:: ; b8323 (2e:4323) + db 0, 1 + db $9c, $63, $9c, $12, $14, $01, $04, $00 + +Palette124:: ; b832d (2e:432d) + db 0, 1 + db $d5, $47, $ce, $22, $88, $01, $05, $00 + +Palette125:: ; b8337 (2e:4337) + db 0, 1 + db $d5, $47, $ce, $22, $88, $01, $05, $00 + +Palette126:: ; b8341 (2e:4341) + db 0, 1 + db $9c, $63, $9c, $32, $9c, $00, $05, $00 + +Palette127:: ; b834b (2e:434b) + db 0, 1 + db $f8, $7f, $40, $7f, $a5, $74, $05, $00 + +Palette128:: ; b8355 (2e:4355) + db 0, 1 + db $ff, $33, $bf, $02, $6e, $01, $23, $04 + +Palette129:: ; b835f (2e:435f) + db 0, 1 + db $9c, $63, $9c, $1e, $5c, $01, $24, $00 + +Palette130:: ; b8369 (2e:4369) + db 0, 1 + db $9c, $63, $39, $22, $12, $01, $04, $00 + +Palette131:: ; b8373 (2e:4373) + db 0, 1 + db $59, $7e, $31, $61, $0a, $48, $05, $00 + +Palette132:: ; b837d (2e:437d) + db 0, 1 + db $9c, $63, $9c, $32, $9c, $00, $05, $00 + +Palette133:: ; b8387 (2e:4387) + db 0, 1 + db $ff, $67, $ff, $02, $9c, $01, $42, $00 + +Palette134:: ; b8391 (2e:4391) + db 0, 1 + db $f8, $7f, $40, $7f, $a5, $74, $00, $08 + +Palette135:: ; b839b (2e:439b) + db 0, 1 + db $f4, $53, $09, $3b, $20, $2a, $60, $00 + +Palette136:: ; b83a5 (2e:43a5) + db 0, 1 + db $9c, $73, $14, $43, $80, $01, $20, $00 + +Palette137:: ; b83af (2e:43af) + db 0, 1 + db $9c, $73, $14, $43, $80, $01, $20, $00 + +Palette138:: ; b83b9 (2e:43b9) + db 0, 1 + db $9c, $73, $14, $43, $80, $01, $20, $00 + +Palette139:: ; b83c3 (2e:43c3) + db 0, 1 + db $9c, $63, $9c, $22, $9c, $00, $04, $00 + +Palette140:: ; b83cd (2e:43cd) + db 0, 1 + db $9c, $63, $9c, $22, $9c, $00, $04, $00 + +Palette141:: ; b83d7 (2e:43d7) + db 0, 1 + db $9c, $63, $9c, $22, $9c, $00, $04, $00 + +Palette142:: ; b83e1 (2e:43e1) + db 0, 1 + db $94, $73, $8c, $62, $08, $51, $00, $10 + +Palette143:: ; b83eb (2e:43eb) + db 0, 1 + db $9c, $33, $18, $22, $08, $11, $22, $04 + +Palette144:: ; b83f5 (2e:43f5) + db 0, 1 + db $9c, $33, $18, $22, $08, $11, $22, $04 + +Palette145:: ; b83ff (2e:43ff) + db 0, 1 + db $18, $63, $14, $32, $18, $11, $02, $00 + +Palette146:: ; b8409 (2e:4409) + db 0, 1 + db $18, $63, $14, $32, $18, $11, $02, $00 + +Palette147:: ; b8413 (2e:4413) + db 0, 1 + db $18, $63, $14, $32, $18, $11, $02, $00 + +Palette148:: ; b841d (2e:441d) + db 0, 1 + db $1c, $63, $94, $31, $8c, $20, $02, $00 + +Palette149:: ; b8427 (2e:4427) + db 0, 1 + db $1c, $63, $94, $31, $8c, $20, $02, $00 + +Palette150:: ; b8431 (2e:4431) + db 0, 1 + db $9c, $62, $14, $42, $10, $31, $22, $04 + +Palette151:: ; b843b (2e:443b) + db 0, 1 + db $9c, $62, $14, $42, $10, $31, $22, $04 + +Palette152:: ; b8445 (2e:4445) + db 0, 1 + db $98, $43, $90, $32, $08, $12, $40, $00 + +Palette153:: ; b844f (2e:444f) + db 0, 1 + db $98, $43, $90, $32, $08, $12, $40, $00 + +Palette154:: ; b8459 (2e:4459) + db 0, 1 + db $98, $43, $90, $32, $08, $12, $40, $00 + +Palette155:: ; b8463 (2e:4463) + db 0, 1 + db $94, $73, $8c, $62, $08, $51, $00, $08 + +Palette156:: ; b846d (2e:446d) + db 0, 1 + db $94, $73, $8c, $62, $08, $51, $00, $08 + +Palette157:: ; b8477 (2e:4477) + db 0, 1 + db $9c, $33, $18, $22, $08, $11, $22, $04 + +Palette158:: ; b8481 (2e:4481) + db 0, 1 + db $1c, $63, $94, $31, $8c, $20, $01, $00 + +Palette159:: ; b848b (2e:448b) + db 0, 1 + db $9c, $62, $14, $42, $10, $31, $22, $04 + +Palette160:: ; b8495 (2e:4495) + db 0, 1 + db $dd, $66, $9f, $41, $16, $28, $03, $08 diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm index a8fe73a..7e1b16a 100644 --- a/src/engine/bank07.asm +++ b/src/engine/bank07.asm @@ -1281,11 +1281,11 @@ Func_1ccbc: ; 1ccbc (7:4cbc) INCROM $1ccd4, $1cce4 Func_1cce4: ; 1cce4 (7:4ce4) - ld hl, $4d55 + ld hl, Data_1cd55 jr Func_1ccee Func_1cce9: ; 1cce9 (7:4ce9) - ld hl, $4d61 + ld hl, Data_1cd61 jr Func_1ccee Func_1ccee: ; 1ccee (7:4cee) @@ -1311,11 +1311,11 @@ Func_1ccee: ; 1ccee (7:4cee) ; 0x1cd10 Func_1cd10: ; 1cd10 (7:4d10) - ld hl, $4d55 + ld hl, Data_1cd55 jr Func_1cd1a Func_1cd15: ; 1cd15 (7:4d15) - ld hl, $4d61 + ld hl, Data_1cd61 jr Func_1cd1a Func_1cd1a: ; 1cd1a (7:4d1a) @@ -1359,7 +1359,11 @@ Func_1cd3c: ; 1cd3c (7:4d3c) ret ; 0x1cd55 - INCROM $1cd55, $1cd71 +Data_1cd55: ; 1cd55 (7:4d55) + db $15, $02, $11, $fe, $0d, $02, $09, $fe, $05, $01, $01, $ff + +Data_1cd61: ; 1cd61 (7:4d61) + db $1d, $04, $19, $fc, $15, $04, $11, $fc, $0d, $03, $09, $fd, $05, $02, $01, $fe Func_1cd71: ; 1cd71 (7:4d71) ld hl, wd4bb diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 9594926..bcb1e26 100644 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -417,7 +417,7 @@ Func_803b9: ; 803b9 (20:43b9) INCROM $803c9, $803ec -; copies from palette data in hl c bytes to palette index b +; copies from palette data in hl c*8 bytes to palette index b ; in WRAM, starting from wBackgroundPalettesCGB ; b = palette index ; c = palette size @@ -1216,167 +1216,181 @@ SpriteAnimationPointers: ; 81333 (20:5333) db $31, $6d, $0d, $00 db $67, $70, $0d, $00 +; \1 = palette pointer +; \2 = number of palettes +; \3 = number of OBJ colors +palette_pointer: MACRO + dw \1 + db BANK(\1) - BANK(MapDataPointers_81697) + db (\2 << 4) + \3 +ENDM + MapDataPointers_81697: ; 81697 (20:5697) - db $8a, $73, $0d, $81 - db $cd, $73, $0d, $80 - db $0f, $74, $0d, $80 - db $51, $74, $0d, $80 - db $93, $74, $0d, $80 - db $d5, $74, $0d, $80 - db $17, $75, $0d, $80 - db $59, $75, $0d, $80 - db $9b, $75, $0d, $80 - db $dd, $75, $0d, $80 - db $1f, $76, $0d, $80 - db $61, $76, $0d, $80 - db $a3, $76, $0d, $80 - db $e5, $76, $0d, $80 - db $27, $77, $0d, $80 - db $69, $77, $0d, $80 - db $ab, $77, $0d, $80 - db $ed, $77, $0d, $80 - db $2f, $78, $0d, $80 - db $71, $78, $0d, $80 - db $b3, $78, $0d, $80 - db $f5, $78, $0d, $80 - db $37, $79, $0d, $80 - db $79, $79, $0d, $80 - db $bb, $79, $0d, $80 - db $fd, $79, $0d, $80 - db $3f, $7a, $0d, $80 - db $81, $7a, $0d, $80 - db $c3, $7a, $0d, $80 - db $05, $7b, $0d, $82 - db $49, $7b, $0d, $82 - db $eb, $7f, $0c, $11 - db $8d, $7b, $0d, $11 - db $98, $7b, $0d, $11 - db $a3, $7b, $0d, $11 - db $ae, $7b, $0d, $11 - db $b9, $7b, $0d, $11 - db $c4, $7b, $0d, $11 - db $cf, $7b, $0d, $11 - db $da, $7b, $0d, $11 - db $e5, $7b, $0d, $11 - db $f0, $7b, $0d, $11 - db $fb, $7b, $0d, $11 - db $06, $7c, $0d, $11 - db $11, $7c, $0d, $11 - db $1c, $7c, $0d, $11 - db $27, $7c, $0d, $11 - db $32, $7c, $0d, $11 - db $3d, $7c, $0d, $11 - db $48, $7c, $0d, $11 - db $53, $7c, $0d, $11 - db $5e, $7c, $0d, $11 - db $69, $7c, $0d, $11 - db $74, $7c, $0d, $11 - db $7f, $7c, $0d, $11 - db $8a, $7c, $0d, $11 - db $95, $7c, $0d, $11 - db $a0, $7c, $0d, $11 - db $ab, $7c, $0d, $11 - db $b6, $7c, $0d, $11 - db $c1, $7c, $0d, $11 - db $cc, $7c, $0d, $11 - db $d7, $7c, $0d, $11 - db $e2, $7c, $0d, $11 - db $ed, $7c, $0d, $11 - db $f8, $7c, $0d, $11 - db $03, $7d, $0d, $11 - db $0e, $7d, $0d, $11 - db $19, $7d, $0d, $11 - db $24, $7d, $0d, $11 - db $2f, $7d, $0d, $11 - db $3a, $7d, $0d, $11 - db $45, $7d, $0d, $11 - db $50, $7d, $0d, $11 - db $5b, $7d, $0d, $11 - db $66, $7d, $0d, $11 - db $71, $7d, $0d, $11 - db $7c, $7d, $0d, $11 - db $87, $7d, $0d, $11 - db $92, $7d, $0d, $11 - db $9d, $7d, $0d, $11 - db $a8, $7d, $0d, $11 - db $b3, $7d, $0d, $11 - db $be, $7d, $0d, $11 - db $c9, $7d, $0d, $11 - db $d4, $7d, $0d, $11 - db $df, $7d, $0d, $11 - db $ea, $7d, $0d, $11 - db $f5, $7d, $0d, $11 - db $00, $7e, $0d, $11 - db $0b, $7e, $0d, $11 - db $16, $7e, $0d, $11 - db $21, $7e, $0d, $11 - db $2c, $7e, $0d, $11 - db $37, $7e, $0d, $80 - db $79, $7e, $0d, $80 - db $bb, $7e, $0d, $80 - db $fd, $7e, $0d, $80 - db $3f, $7f, $0d, $80 - db $81, $7f, $0d, $80 - db $00, $40, $0e, $80 - db $c3, $7f, $0d, $70 - db $42, $40, $0e, $70 - db $7c, $40, $0e, $70 - db $b6, $40, $0e, $70 - db $f0, $40, $0e, $70 - db $2a, $41, $0e, $70 - db $64, $41, $0e, $70 - db $fd, $7f, $0d, $01 - db $fb, $7f, $02, $01 - db $5b, $7c, $00, $00 - db $9e, $41, $0e, $81 - db $e1, $41, $0e, $81 - db $24, $42, $0e, $81 - db $67, $42, $0e, $42 - db $8b, $42, $0e, $42 - db $af, $42, $0e, $42 - db $f6, $7f, $08, $10 - db $d3, $42, $0e, $60 - db $f6, $7f, $0c, $10 - db $05, $43, $0e, $10 - db $0f, $43, $0e, $10 - db $19, $43, $0e, $10 - db $23, $43, $0e, $10 - db $2d, $43, $0e, $10 - db $37, $43, $0e, $10 - db $41, $43, $0e, $10 - db $4b, $43, $0e, $10 - db $55, $43, $0e, $10 - db $5f, $43, $0e, $10 - db $69, $43, $0e, $10 - db $73, $43, $0e, $10 - db $7d, $43, $0e, $10 - db $87, $43, $0e, $10 - db $91, $43, $0e, $10 - db $9b, $43, $0e, $10 - db $a5, $43, $0e, $10 - db $af, $43, $0e, $10 - db $b9, $43, $0e, $10 - db $c3, $43, $0e, $10 - db $cd, $43, $0e, $10 - db $d7, $43, $0e, $10 - db $e1, $43, $0e, $10 - db $eb, $43, $0e, $10 - db $f5, $43, $0e, $10 - db $ff, $43, $0e, $10 - db $09, $44, $0e, $10 - db $13, $44, $0e, $10 - db $1d, $44, $0e, $10 - db $27, $44, $0e, $10 - db $31, $44, $0e, $10 - db $3b, $44, $0e, $10 - db $45, $44, $0e, $10 - db $4f, $44, $0e, $10 - db $59, $44, $0e, $10 - db $63, $44, $0e, $10 - db $6d, $44, $0e, $10 - db $77, $44, $0e, $10 - db $81, $44, $0e, $10 - db $8b, $44, $0e, $10 - db $95, $44, $0e, $10 + palette_pointer Palette0, 8, 1 + palette_pointer Palette1, 8, 0 + palette_pointer Palette2, 8, 0 + palette_pointer Palette3, 8, 0 + palette_pointer Palette4, 8, 0 + palette_pointer Palette5, 8, 0 + palette_pointer Palette6, 8, 0 + palette_pointer Palette7, 8, 0 + palette_pointer Palette8, 8, 0 + palette_pointer Palette9, 8, 0 + palette_pointer Palette10, 8, 0 + palette_pointer Palette11, 8, 0 + palette_pointer Palette12, 8, 0 + palette_pointer Palette13, 8, 0 + palette_pointer Palette14, 8, 0 + palette_pointer Palette15, 8, 0 + palette_pointer Palette16, 8, 0 + palette_pointer Palette17, 8, 0 + palette_pointer Palette18, 8, 0 + palette_pointer Palette19, 8, 0 + palette_pointer Palette20, 8, 0 + palette_pointer Palette21, 8, 0 + palette_pointer Palette22, 8, 0 + palette_pointer Palette23, 8, 0 + palette_pointer Palette24, 8, 0 + palette_pointer Palette25, 8, 0 + palette_pointer Palette26, 8, 0 + palette_pointer Palette27, 8, 0 + palette_pointer Palette28, 8, 0 + palette_pointer Palette29, 8, 2 + palette_pointer Palette30, 8, 2 + palette_pointer Palette31, 1, 1 + palette_pointer Palette32, 1, 1 + palette_pointer Palette33, 1, 1 + palette_pointer Palette34, 1, 1 + palette_pointer Palette35, 1, 1 + palette_pointer Palette36, 1, 1 + palette_pointer Palette37, 1, 1 + palette_pointer Palette38, 1, 1 + palette_pointer Palette39, 1, 1 + palette_pointer Palette40, 1, 1 + palette_pointer Palette41, 1, 1 + palette_pointer Palette42, 1, 1 + palette_pointer Palette43, 1, 1 + palette_pointer Palette44, 1, 1 + palette_pointer Palette45, 1, 1 + palette_pointer Palette46, 1, 1 + palette_pointer Palette47, 1, 1 + palette_pointer Palette48, 1, 1 + palette_pointer Palette49, 1, 1 + palette_pointer Palette50, 1, 1 + palette_pointer Palette51, 1, 1 + palette_pointer Palette52, 1, 1 + palette_pointer Palette53, 1, 1 + palette_pointer Palette54, 1, 1 + palette_pointer Palette55, 1, 1 + palette_pointer Palette56, 1, 1 + palette_pointer Palette57, 1, 1 + palette_pointer Palette58, 1, 1 + palette_pointer Palette59, 1, 1 + palette_pointer Palette60, 1, 1 + palette_pointer Palette61, 1, 1 + palette_pointer Palette62, 1, 1 + palette_pointer Palette63, 1, 1 + palette_pointer Palette64, 1, 1 + palette_pointer Palette65, 1, 1 + palette_pointer Palette66, 1, 1 + palette_pointer Palette67, 1, 1 + palette_pointer Palette68, 1, 1 + palette_pointer Palette69, 1, 1 + palette_pointer Palette70, 1, 1 + palette_pointer Palette71, 1, 1 + palette_pointer Palette72, 1, 1 + palette_pointer Palette73, 1, 1 + palette_pointer Palette74, 1, 1 + palette_pointer Palette75, 1, 1 + palette_pointer Palette76, 1, 1 + palette_pointer Palette77, 1, 1 + palette_pointer Palette78, 1, 1 + palette_pointer Palette79, 1, 1 + palette_pointer Palette80, 1, 1 + palette_pointer Palette81, 1, 1 + palette_pointer Palette82, 1, 1 + palette_pointer Palette83, 1, 1 + palette_pointer Palette84, 1, 1 + palette_pointer Palette85, 1, 1 + palette_pointer Palette86, 1, 1 + palette_pointer Palette87, 1, 1 + palette_pointer Palette88, 1, 1 + palette_pointer Palette89, 1, 1 + palette_pointer Palette90, 1, 1 + palette_pointer Palette91, 1, 1 + palette_pointer Palette92, 1, 1 + palette_pointer Palette93, 1, 1 + palette_pointer Palette94, 8, 0 + palette_pointer Palette95, 8, 0 + palette_pointer Palette96, 8, 0 + palette_pointer Palette97, 8, 0 + palette_pointer Palette98, 8, 0 + palette_pointer Palette99, 8, 0 + palette_pointer Palette100, 8, 0 + palette_pointer Palette101, 7, 0 + palette_pointer Palette102, 7, 0 + palette_pointer Palette103, 7, 0 + palette_pointer Palette104, 7, 0 + palette_pointer Palette105, 7, 0 + palette_pointer Palette106, 7, 0 + palette_pointer Palette107, 7, 0 + palette_pointer Palette108, 0, 1 + palette_pointer Palette109, 0, 1 + palette_pointer Palette110, 0, 0 + palette_pointer Palette111, 8, 1 + palette_pointer Palette112, 8, 1 + palette_pointer Palette113, 8, 1 + palette_pointer Palette114, 4, 2 + palette_pointer Palette115, 4, 2 + palette_pointer Palette116, 4, 2 + palette_pointer Palette117, 1, 0 + palette_pointer Palette118, 6, 0 + palette_pointer Palette119, 1, 0 + palette_pointer Palette120, 1, 0 + palette_pointer Palette121, 1, 0 + palette_pointer Palette122, 1, 0 + palette_pointer Palette123, 1, 0 + palette_pointer Palette124, 1, 0 + palette_pointer Palette125, 1, 0 + palette_pointer Palette126, 1, 0 + palette_pointer Palette127, 1, 0 + palette_pointer Palette128, 1, 0 + palette_pointer Palette129, 1, 0 + palette_pointer Palette130, 1, 0 + palette_pointer Palette131, 1, 0 + palette_pointer Palette132, 1, 0 + palette_pointer Palette133, 1, 0 + palette_pointer Palette134, 1, 0 + palette_pointer Palette135, 1, 0 + palette_pointer Palette136, 1, 0 + palette_pointer Palette137, 1, 0 + palette_pointer Palette138, 1, 0 + palette_pointer Palette139, 1, 0 + palette_pointer Palette140, 1, 0 + palette_pointer Palette141, 1, 0 + palette_pointer Palette142, 1, 0 + palette_pointer Palette143, 1, 0 + palette_pointer Palette144, 1, 0 + palette_pointer Palette145, 1, 0 + palette_pointer Palette146, 1, 0 + palette_pointer Palette147, 1, 0 + palette_pointer Palette148, 1, 0 + palette_pointer Palette149, 1, 0 + palette_pointer Palette150, 1, 0 + palette_pointer Palette151, 1, 0 + palette_pointer Palette152, 1, 0 + palette_pointer Palette153, 1, 0 + palette_pointer Palette154, 1, 0 + palette_pointer Palette155, 1, 0 + palette_pointer Palette156, 1, 0 + palette_pointer Palette157, 1, 0 + palette_pointer Palette158, 1, 0 + palette_pointer Palette159, 1, 0 + palette_pointer Palette160, 1, 0 + + INCROM $8191b, $83c5b + +Palette110:: ; 83c5b (20:3c5b) + db $00, $00 - INCROM $8191b, $84000 + INCROM $83c5d, $84000 diff --git a/src/gfx.asm b/src/gfx.asm index 2cf2d77..4f62bf8 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -116,7 +116,14 @@ Duel57Gfx: ; 8bfd2 (22:7fd2) dw $1 INCBIN "gfx/duel/anims/57.2bpp" - INCROM $8bfe4, $8c000 + INCROM $8bfe4, $8bffb + +Palette109:: ; 8bffb (22:7ffb) + db 1, $e4, 0 + +rept $2 + db $ff +endr SECTION "Gfx 5", ROMX @@ -631,7 +638,9 @@ Duel66Gfx: ; a3fb4 (28:7fb4) dw $4 INCBIN "gfx/duel/anims/66.2bpp" - INCROM $a3ff6, $a4000 +Palette117:: ; a3ff6 (28:7ff6) + db 0, 1 + db $7b, $63, $ff, $03, $1f, $00, $00, $4d SECTION "Gfx 11", ROMX @@ -913,13 +922,28 @@ SECTION "Gfx 13", ROMX INCROM $ac000, $b0000 SECTION "Gfx 14", ROMX - INCROM $b0000, $b4000 + INCROM $b0000, $b3feb + +Palette31:: ; b3feb (2c:7feb) + db 1, $d2, 1 + db $00, $00, $ff, $1f, $1f, $1b, $6b, $00 + +Palette119:: ; b3ff6 (2c:7ff6) + db 0, 1 + db $9c, $63, $1c, $32, $9c, $20, $00, $20 SECTION "Gfx 15", ROMX - INCROM $b4000, $b8000 + INCROM $b4000, $b738a + +SECTION "Palettes1", ROMX + INCLUDE "data/palettes1.asm" + +SECTION "Palettes2", ROMX + INCLUDE "data/palettes2.asm" -SECTION "Gfx 16", ROMX - INCROM $b8000, $bc000 +rept $3b61 + db $ff +endr SECTION "Card Gfx 1", ROMX diff --git a/src/layout.link b/src/layout.link index 49511eb..f585265 100644 --- a/src/layout.link +++ b/src/layout.link @@ -119,8 +119,9 @@ ROMX $2c "Gfx 14" ROMX $2d "Gfx 15" + "Palettes1" ROMX $2e - "Gfx 16" + "Palettes2" ROMX $2f "Empty Bank 2F" ROMX $30 -- cgit v1.2.3