Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up color/palette code

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-25 12:41:31 -05:00
parent ec8c9688ce
commit da2b01a36c
32 changed files with 418 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/maps/mapgroup_roofs.asm
View File

@@ -1,6 +1,5 @@
; valid roofs: 0, 1, 2, 3, 4, or -1 for none
MapGroupRoofs: ; 1c021i MapGroupRoofs: ; 1c021i
; entries correspond to Roofs (see below)
db -1 ; group 0 (unused) db -1 ; group 0 (unused)
db 3 ; group 1 (Olivine) db 3 ; group 1 (Olivine)
db 2 ; group 2 (Mahogany) db 2 ; group 2 (Mahogany)
@@ -29,3 +28,11 @@ MapGroupRoofs: ; 1c021i
db -1 ; group 25 db -1 ; group 25
db 0 ; group 26 (Cherrygrove) db 0 ; group 26 (Cherrygrove)
; 1c03c ; 1c03c
Roofs: ; 1c03c
INCBIN "gfx/tilesets/roofs/0.2bpp"
INCBIN "gfx/tilesets/roofs/1.2bpp"
INCBIN "gfx/tilesets/roofs/2.2bpp"
INCBIN "gfx/tilesets/roofs/3.2bpp"
INCBIN "gfx/tilesets/roofs/4.2bpp"
; 1c30c

11
data/palettes/979c.pal → data/palettes/battle_objects.pal
View File

@@ -1,28 +1,29 @@
; gray
RGB 31, 31, 31 RGB 31, 31, 31
RGB 25, 25, 25 RGB 25, 25, 25
RGB 13, 13, 13 RGB 13, 13, 13
RGB 00, 00, 00 RGB 00, 00, 00
; yellow
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 31, 07 RGB 31, 31, 07
RGB 31, 16, 01 RGB 31, 16, 01
RGB 00, 00, 00 RGB 00, 00, 00
; red
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 19, 24 RGB 31, 19, 24
RGB 30, 10, 06 RGB 30, 10, 06
RGB 00, 00, 00 RGB 00, 00, 00
; green
RGB 31, 31, 31 RGB 31, 31, 31
RGB 12, 25, 01 RGB 12, 25, 01
RGB 05, 14, 00 RGB 05, 14, 00
RGB 00, 00, 00 RGB 00, 00, 00
; blue
RGB 31, 31, 31 RGB 31, 31, 31
RGB 08, 12, 31 RGB 08, 12, 31
RGB 01, 04, 31 RGB 01, 04, 31
RGB 00, 00, 00 RGB 00, 00, 00
; brown
RGB 31, 31, 31 RGB 31, 31, 31
RGB 24, 18, 07 RGB 24, 18, 07
RGB 20, 15, 03 RGB 20, 15, 03

40
data/palettes/blk_packets.asm Normal file
View File

@@ -0,0 +1,40 @@
BlkPacket_9a86:
db $21, $01, $03, $00, $00, $00, $13, $11, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9a96:
db $21, $01, $07, $05, $00, $0a, $13, $0d, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9aa6:
db $22, $05, $07, $0a, $00, $0c, $13, $11, $03, $05, $01, $00, $0a, $03, $03, $00
db $0a, $08, $13, $0a, $03, $0a, $00, $04, $08, $0b, $03, $0f, $0b, $00, $13, $07
BlkPacket_9ac6:
db $21, $01, $07, $05, $00, $01, $07, $07, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9ad6:
db $21, $01, $07, $05, $0b, $01, $13, $02, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9ae6:
db $21, $01, $07, $05, $01, $01, $08, $08, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9af6:
db $21, $01, $07, $05, $07, $05, $0d, $0b, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9b06:
db $22, $05, $03, $05, $00, $00, $13, $0b, $03, $0a, $00, $04, $13, $09, $02, $0f
db $00, $06, $13, $07, $03, $00, $04, $04, $0f, $09, $03, $00, $00, $0c, $13, $11
BlkPacket_9b26:
db $23, $07, $07, $10, $00, $00, $02, $0c, $02, $00, $0c, $00, $12, $01, $02, $00
db $0c, $02, $12, $03, $02, $00, $0c, $04, $12, $05, $02, $00, $0c, $06, $12, $07
db $02, $00, $0c, $08, $12, $09, $02, $00, $0c, $0a, $12, $0b, $00, $00, $00, $00
BlkPacket_9b56:
db $22, $03, $07, $20, $00, $00, $13, $04, $03, $0f, $00, $06, $13, $11, $03, $05
db $0f, $01, $12, $04, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9b76:
db $21, $01, $07, $10, $00, $00, $13, $05, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9b86:
db $21, $02, $07, $0a, $00, $04, $13, $0d, $03, $05, $00, $06, $13, $0b, $00, $00

3
data/palettes/exp_bar.pal Normal file
View File

@@ -0,0 +1,3 @@
; blue
RGB 30, 26, 15
RGB 04, 17, 31

9
data/palettes/hp_bar.pal Normal file
View File

@@ -0,0 +1,9 @@
; green
RGB 30, 26, 15
RGB 00, 23, 00
; yellow
RGB 30, 26, 15
RGB 31, 21, 00
; red
RGB 30, 26, 15
RGB 31, 00, 00

4
data/palettes/overworld/bg_text.pal Normal file
View File

@@ -0,0 +1,4 @@
RGB 31, 31, 31
RGB 08, 19, 28
RGB 05, 05, 16
RGB 00, 00, 00

8
data/palettes/map_objects.pal → data/palettes/overworld/map_objects.pal
View File

@@ -1,4 +1,4 @@
; morn ; morn
RGB 28,31,16, 31,19,10, 31,07,01, 00,00,00 ; red RGB 28,31,16, 31,19,10, 31,07,01, 00,00,00 ; red
RGB 28,31,16, 31,19,10, 10,09,31, 00,00,00 ; blue RGB 28,31,16, 31,19,10, 10,09,31, 00,00,00 ; blue
RGB 28,31,16, 31,19,10, 07,23,03, 00,00,00 ; green RGB 28,31,16, 31,19,10, 07,23,03, 00,00,00 ; green
@@ -8,7 +8,7 @@
RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree
RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; rock RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; rock
; day ; day
RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red
RGB 27,31,27, 31,19,10, 10,09,31, 00,00,00 ; blue RGB 27,31,27, 31,19,10, 10,09,31, 00,00,00 ; blue
RGB 27,31,27, 31,19,10, 07,23,03, 00,00,00 ; green RGB 27,31,27, 31,19,10, 07,23,03, 00,00,00 ; green
@@ -18,7 +18,7 @@
RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree
RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; rock RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; rock
; nite ; nite
RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red
RGB 15,14,24, 31,19,10, 10,09,31, 00,00,00 ; blue RGB 15,14,24, 31,19,10, 10,09,31, 00,00,00 ; blue
RGB 15,14,24, 31,19,10, 07,23,03, 00,00,00 ; green RGB 15,14,24, 31,19,10, 07,23,03, 00,00,00 ; green
@@ -28,7 +28,7 @@
RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree
RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock
; dark ; dark
RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red
RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue
RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green

0
data/palettes/roofs.pal → data/palettes/overworld/roofs.pal
View File

61
data/palettes/overworld/tileset_bg.pal Normal file
View File

@@ -0,0 +1,61 @@
; morn
RGB 28,31,16, 21,21,21, 13,13,13, 07,07,07 ; gray
RGB 28,31,16, 31,19,24, 30,10,06, 07,07,07 ; red
RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; green
RGB 31,31,31, 08,12,31, 01,04,31, 07,07,07 ; water
RGB 28,31,16, 31,31,07, 31,16,01, 07,07,07 ; yellow
RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; brown
RGB 28,31,16, 15,31,31, 05,17,31, 07,07,07 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
; day
RGB 27,31,27, 21,21,21, 13,13,13, 07,07,07 ; gray
RGB 27,31,27, 31,19,24, 30,10,06, 07,07,07 ; red
RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; green
RGB 31,31,31, 08,12,31, 01,04,31, 07,07,07 ; water
RGB 27,31,27, 31,31,07, 31,16,01, 07,07,07 ; yellow
RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; brown
RGB 27,31,27, 15,31,31, 05,17,31, 07,07,07 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
; nite
RGB 15,14,24, 11,11,19, 07,07,12, 00,00,00 ; gray
RGB 15,14,24, 14,07,17, 13,00,08, 00,00,00 ; red
RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; green
RGB 15,14,24, 05,05,17, 03,03,10, 00,00,00 ; water
RGB 30,30,11, 16,14,18, 16,14,10, 00,00,00 ; yellow
RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; brown
RGB 15,14,24, 13,12,23, 11,09,20, 00,00,00 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
; dark
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; gray
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; red
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; green
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; water
RGB 30,30,11, 00,00,00, 00,00,00, 00,00,00 ; yellow
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; brown
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
; indoor
RGB 30,28,26, 19,19,19, 13,13,13, 07,07,07 ; gray
RGB 30,28,26, 31,19,24, 30,10,06, 07,07,07 ; red
RGB 18,24,09, 15,20,01, 09,13,00, 07,07,07 ; green
RGB 30,28,26, 15,16,31, 09,09,31, 07,07,07 ; water
RGB 30,28,26, 31,31,07, 31,16,01, 07,07,07 ; yellow
RGB 26,24,17, 21,17,07, 16,13,03, 07,07,07 ; brown
RGB 30,28,26, 17,19,31, 14,16,31, 07,07,07 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
; overworld water
; morn/day
RGB 23, 23, 31
RGB 18, 19, 31
RGB 13, 12, 31
RGB 07, 07, 07
; nite
RGB 15, 13, 27
RGB 10, 09, 20
RGB 04, 03, 18
RGB 00, 00, 00

113
data/palettes/pal_packets.asm Normal file
View File

@@ -0,0 +1,113 @@
PalPacket_9b96:
db $51, $48, $00, $49, $00, $4a, $00, $4b, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9ba6:
db $51, $2b, $00, $24, $00, $20, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9bb6:
db $51, $41, $00, $42, $00, $43, $00, $44, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9bc6:
db $51, $4c, $00, $4c, $00, $4c, $00, $4c, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9bd6:
db $51, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9be6:
db $51, $36, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9bf6:
db $51, $37, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c06:
db $51, $38, $00, $39, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c16:
db $51, $3a, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c26:
db $51, $3b, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c36:
db $51, $3c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c46:
db $51, $39, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c56:
db $51, $2e, $00, $2f, $00, $30, $00, $31, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c66:
db $51, $1a, $00, $1a, $00, $1a, $00, $1a, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c76:
db $51, $32, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c86:
db $51, $3c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c96:
db $51, $3d, $00, $3e, $00, $3f, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9ca6:
db $51, $33, $00, $34, $00, $1b, $00, $1f, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9cb6:
db $51, $1b, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9cc6:
db $51, $1c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9cd6:
db $51, $35, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9ce6:
db $01, $ff, $7f, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9cf6:
db $09, $ff, $7f, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d06:
db $59, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d16:
db $89, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d26:
db $89, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d36:
db $99, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d46:
db $a1, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d56:
db $b9, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d66:
db $b9, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d76:
db $79, $5d, $08, $00, $0b, $8c, $d0, $f4, $60, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d86:
db $79, $52, $08, $00, $0b, $a9, $e7, $9f, $01, $c0, $7e, $e8, $e8, $e8, $e8, $e0
PalPacket_9d96:
db $79, $47, $08, $00, $0b, $c4, $d0, $16, $a5, $cb, $c9, $05, $d0, $10, $a2, $28
PalPacket_9da6:
db $79, $3c, $08, $00, $0b, $f0, $12, $a5, $c9, $c9, $c8, $d0, $1c, $a5, $ca, $c9
PalPacket_9db6:
db $79, $31, $08, $00, $0b, $0c, $a5, $ca, $c9, $7e, $d0, $06, $a5, $cb, $c9, $7e
PalPacket_9dc6:
db $79, $26, $08, $00, $0b, $39, $cd, $48, $0c, $d0, $34, $a5, $c9, $c9, $80, $d0
PalPacket_9dd6:
db $79, $1b, $08, $00, $0b, $ea, $ea, $ea, $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0
PalPacket_9de6:
db $79, $10, $08, $00, $0b, $4c, $20, $08, $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea

157
data/palettes/predef.pal
View File

@@ -1,393 +1,394 @@
; $00
RGB 31, 31, 31 RGB 31, 31, 31
RGB 22, 25, 19 RGB 22, 25, 19
RGB 16, 21, 30 RGB 16, 21, 30
RGB 00, 00, 00 RGB 00, 00, 00
; $01
RGB 31, 31, 31 RGB 31, 31, 31
RGB 27, 28, 31 RGB 27, 28, 31
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $02
RGB 31, 31, 31 RGB 31, 31, 31
RGB 24, 28, 19 RGB 24, 28, 19
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $03
RGB 31, 31, 31 RGB 31, 31, 31
RGB 24, 24, 24 RGB 24, 24, 24
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $04
RGB 31, 31, 31 RGB 31, 31, 31
RGB 21, 23, 31 RGB 21, 23, 31
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $05
RGB 31, 31, 31 RGB 31, 31, 31
RGB 24, 21, 27 RGB 24, 21, 27
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $06
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 24, 16 RGB 31, 24, 16
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $07
RGB 31, 31, 31 RGB 31, 31, 31
RGB 25, 30, 26 RGB 25, 30, 26
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $08
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 25, 31 RGB 31, 25, 31
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $09
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 20, 19 RGB 31, 20, 19
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $0a
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 26, 19 RGB 31, 26, 19
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $0b
RGB 31, 31, 31 RGB 31, 31, 31
RGB 27, 28, 27 RGB 27, 28, 27
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $0c
RGB 31, 31, 31 RGB 31, 31, 31
RGB 24, 30, 23 RGB 24, 30, 23
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $0d
RGB 31, 31, 31 RGB 31, 31, 31
RGB 29, 24, 29 RGB 29, 24, 29
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $0e
RGB 31, 31, 31 RGB 31, 31, 31
RGB 26, 23, 29 RGB 26, 23, 29
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $0f
RGB 31, 31, 31 RGB 31, 31, 31
RGB 25, 23, 20 RGB 25, 23, 20
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $10
RGB 31, 31, 31 RGB 31, 31, 31
RGB 29, 26, 18 RGB 29, 26, 18
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $11
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 21, 18 RGB 31, 21, 18
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $12
RGB 31, 31, 31 RGB 31, 31, 31
RGB 26, 25, 31 RGB 26, 25, 31
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $13
RGB 31, 31, 31 RGB 31, 31, 31
RGB 22, 21, 31 RGB 22, 21, 31
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $14
RGB 31, 31, 31 RGB 31, 31, 31
RGB 22, 25, 21 RGB 22, 25, 21
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $15
RGB 31, 31, 31 RGB 31, 31, 31
RGB 21, 21, 22 RGB 21, 21, 22
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $16
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 20, 20 RGB 31, 20, 20
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $17
RGB 31, 31, 31 RGB 31, 31, 31
RGB 26, 26, 26 RGB 26, 26, 26
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $18
RGB 31, 31, 31 RGB 31, 31, 31
RGB 21, 14, 09 RGB 21, 14, 09
RGB 15, 20, 20 RGB 15, 20, 20
RGB 00, 00, 00 RGB 00, 00, 00
; $19
RGB 31, 31, 31 RGB 31, 31, 31
RGB 12, 28, 22 RGB 12, 28, 22
RGB 15, 20, 20 RGB 15, 20, 20
RGB 00, 00, 00 RGB 00, 00, 00
; $1a
RGB 31, 31, 31 RGB 31, 31, 31
RGB 07, 07, 07 RGB 07, 07, 07
RGB 02, 03, 03 RGB 02, 03, 03
RGB 00, 00, 00 RGB 00, 00, 00
; $1b
RGB 31, 31, 31 RGB 31, 31, 31
RGB 30, 22, 17 RGB 30, 22, 17
RGB 16, 14, 19 RGB 16, 14, 19
RGB 00, 00, 00 RGB 00, 00, 00
; $1c
RGB 31, 31, 31 RGB 31, 31, 31
RGB 18, 20, 27 RGB 18, 20, 27
RGB 11, 15, 23 RGB 11, 15, 23
RGB 00, 00, 00 RGB 00, 00, 00
; $1d
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 20, 10 RGB 31, 20, 10
RGB 26, 10, 06 RGB 26, 10, 06
RGB 00, 00, 00 RGB 00, 00, 00
; $1e
RGB 31, 31, 31 RGB 31, 31, 31
RGB 21, 25, 29 RGB 21, 25, 29
RGB 14, 19, 25 RGB 14, 19, 25
RGB 00, 00, 00 RGB 00, 00, 00
; $1f
RGB 31, 31, 31 RGB 31, 31, 31
RGB 27, 22, 24 RGB 27, 22, 24
RGB 21, 15, 23 RGB 21, 15, 23
RGB 00, 00, 00 RGB 00, 00, 00
; $20
RGB 31, 31, 31 RGB 31, 31, 31
RGB 28, 20, 15 RGB 28, 20, 15
RGB 21, 14, 09 RGB 21, 14, 09
RGB 00, 00, 00 RGB 00, 00, 00
; $21
RGB 31, 31, 31 RGB 31, 31, 31
RGB 20, 26, 16 RGB 20, 26, 16
RGB 09, 20, 11 RGB 09, 20, 11
RGB 00, 00, 00 RGB 00, 00, 00
; $22
RGB 31, 31, 31 RGB 31, 31, 31
RGB 30, 22, 24 RGB 30, 22, 24
RGB 28, 15, 21 RGB 28, 15, 21
RGB 00, 00, 00 RGB 00, 00, 00
; $23
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 28, 14 RGB 31, 28, 14
RGB 26, 20, 00 RGB 26, 20, 00
RGB 00, 00, 00 RGB 00, 00, 00
; $24
RGB 31, 31, 31 RGB 31, 31, 31
RGB 26, 21, 22 RGB 26, 21, 22
RGB 15, 15, 18 RGB 15, 15, 18
RGB 00, 00, 00 RGB 00, 00, 00
; $25
RGB 31, 31, 31 RGB 31, 31, 31
RGB 23, 19, 13 RGB 23, 19, 13
RGB 14, 12, 17 RGB 14, 12, 17
RGB 00, 00, 00 RGB 00, 00, 00
; $26
RGB 31, 31, 31 RGB 31, 31, 31
RGB 16, 18, 21 RGB 16, 18, 21
RGB 10, 12, 18 RGB 10, 12, 18
RGB 00, 00, 00 RGB 00, 00, 00
; $27
RGB 31, 31, 31 RGB 31, 31, 31
RGB 22, 15, 16 RGB 22, 15, 16
RGB 17, 02, 05 RGB 17, 02, 05
RGB 00, 00, 00 RGB 00, 00, 00
; $28
RGB 31, 31, 31 RGB 31, 31, 31
RGB 15, 20, 20 RGB 15, 20, 20
RGB 05, 16, 16 RGB 05, 16, 16
RGB 00, 00, 00 RGB 00, 00, 00
; $29
RGB 31, 31, 31 RGB 31, 31, 31
RGB 23, 15, 19 RGB 23, 15, 19
RGB 14, 04, 12 RGB 14, 04, 12
RGB 00, 00, 00 RGB 00, 00, 00
; $2a
RGB 31, 31, 31 RGB 31, 31, 31
RGB 20, 17, 18 RGB 20, 17, 18
RGB 18, 13, 11 RGB 18, 13, 11
RGB 00, 00, 00 RGB 00, 00, 00
; $2b
RGB 31, 31, 31 RGB 31, 31, 31
RGB 23, 21, 16 RGB 23, 21, 16
RGB 12, 12, 10 RGB 12, 12, 10
RGB 00, 00, 00 RGB 00, 00, 00
; $2c
RGB 31, 31, 31 RGB 31, 31, 31
RGB 21, 25, 29 RGB 21, 25, 29
RGB 30, 22, 24 RGB 30, 22, 24
RGB 00, 00, 00 RGB 00, 00, 00
; $2d
RGB 31, 31, 31 RGB 31, 31, 31
RGB 26, 23, 16 RGB 26, 23, 16
RGB 29, 14, 09 RGB 29, 14, 09
RGB 00, 00, 00 RGB 00, 00, 00
; $2e
RGB 31, 31, 31 RGB 31, 31, 31
RGB 18, 18, 18 RGB 18, 18, 18
RGB 10, 10, 10 RGB 10, 10, 10
RGB 00, 00, 00 RGB 00, 00, 00
; $2f
RGB 31, 31, 31 RGB 31, 31, 31
RGB 30, 26, 15 RGB 30, 26, 15
RGB 00, 23, 00 RGB 00, 23, 00
RGB 00, 00, 00 RGB 00, 00, 00
; $30
RGB 31, 31, 31 RGB 31, 31, 31
RGB 30, 26, 15 RGB 30, 26, 15
RGB 31, 23, 00 RGB 31, 23, 00
RGB 00, 00, 00 RGB 00, 00, 00
; $31
RGB 31, 31, 31 RGB 31, 31, 31
RGB 30, 26, 15 RGB 30, 26, 15
RGB 31, 00, 00 RGB 31, 00, 00
RGB 00, 00, 00 RGB 00, 00, 00
; $32
RGB 31, 31, 31 RGB 31, 31, 31
RGB 29, 26, 19 RGB 29, 26, 19
RGB 27, 20, 14 RGB 27, 20, 14
RGB 00, 00, 00 RGB 00, 00, 00
; $33
RGB 31, 31, 31 RGB 31, 31, 31
RGB 24, 20, 10 RGB 24, 20, 10
RGB 21, 00, 04 RGB 21, 00, 04
RGB 00, 00, 00 RGB 00, 00, 00
; $34
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 20, 10 RGB 31, 20, 10
RGB 21, 00, 04 RGB 21, 00, 04
RGB 00, 00, 00 RGB 00, 00, 00
; $35
RGB 31, 31, 31 RGB 31, 31, 31
RGB 30, 26, 16 RGB 30, 26, 16
RGB 16, 12, 09 RGB 16, 12, 09
RGB 00, 00, 00 RGB 00, 00, 00
; $36
RGB 31, 31, 31 RGB 31, 31, 31
RGB 15, 28, 26 RGB 15, 28, 26
RGB 12, 22, 26 RGB 12, 22, 26
RGB 03, 16, 14 RGB 03, 16, 14
; $37
RGB 31, 31, 31 RGB 31, 31, 31
RGB 15, 28, 26 RGB 15, 28, 26
RGB 23, 24, 24 RGB 23, 24, 24
RGB 00, 00, 00 RGB 00, 00, 00
; $38
RGB 31, 31, 24 RGB 31, 31, 24
RGB 07, 27, 19 RGB 07, 27, 19
RGB 26, 20, 10 RGB 26, 20, 10
RGB 19, 12, 08 RGB 19, 12, 08
; $39
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 28, 14 RGB 31, 28, 14
RGB 31, 13, 31 RGB 31, 13, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $3a
RGB 31, 31, 31 RGB 31, 31, 31
RGB 16, 18, 21 RGB 16, 18, 21
RGB 10, 12, 18 RGB 10, 12, 18
RGB 00, 00, 00 RGB 00, 00, 00
; $3b
RGB 31, 31, 31 RGB 31, 31, 31
RGB 23, 21, 16 RGB 23, 21, 16
RGB 12, 12, 10 RGB 12, 12, 10
RGB 00, 00, 00 RGB 00, 00, 00
; $3c
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 14, 00 RGB 31, 14, 00
RGB 07, 11, 15 RGB 07, 11, 15
RGB 00, 00, 00 RGB 00, 00, 00
; $3d
RGB 31, 31, 31 RGB 31, 31, 31
RGB 26, 21, 22 RGB 26, 21, 22
RGB 26, 10, 06 RGB 26, 10, 06
RGB 00, 00, 00 RGB 00, 00, 00
; $3e
RGB 31, 31, 31 RGB 31, 31, 31
RGB 30, 27, 04 RGB 30, 27, 04
RGB 24, 20, 11 RGB 24, 20, 11
RGB 00, 00, 00 RGB 00, 00, 00
; $3f
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 13, 25 RGB 31, 13, 25
RGB 24, 20, 11 RGB 24, 20, 11
RGB 00, 00, 00 RGB 00, 00, 00
; $40
RGB 31, 31, 31 RGB 31, 31, 31
RGB 16, 19, 29 RGB 16, 19, 29
RGB 24, 20, 11 RGB 24, 20, 11
RGB 00, 00, 00 RGB 00, 00, 00
; $41
RGB 31, 31, 31 RGB 31, 31, 31
RGB 30, 22, 24 RGB 30, 22, 24
RGB 18, 18, 18 RGB 18, 18, 18
RGB 16, 10, 07 RGB 16, 10, 07
; $42
RGB 31, 31, 31 RGB 31, 31, 31
RGB 21, 25, 29 RGB 21, 25, 29
RGB 18, 18, 18 RGB 18, 18, 18
RGB 16, 10, 07 RGB 16, 10, 07
; $43
RGB 31, 31, 31 RGB 31, 31, 31
RGB 20, 26, 16 RGB 20, 26, 16
RGB 18, 18, 18 RGB 18, 18, 18
RGB 16, 10, 07 RGB 16, 10, 07
; $44
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 28, 14 RGB 31, 28, 14
RGB 18, 18, 18 RGB 18, 18, 18
RGB 16, 10, 07 RGB 16, 10, 07
; $45
RGB 31, 31, 31 RGB 31, 31, 31
RGB 18, 18, 18 RGB 18, 18, 18
RGB 26, 10, 06 RGB 26, 10, 06
RGB 00, 00, 00 RGB 00, 00, 00
; $46
RGB 31, 31, 31 RGB 31, 31, 31
RGB 30, 22, 24 RGB 30, 22, 24
RGB 28, 15, 21 RGB 28, 15, 21
RGB 00, 00, 00 RGB 00, 00, 00
; $47
RGB 31, 31, 31 RGB 31, 31, 31
RGB 26, 20, 00 RGB 26, 20, 00
RGB 16, 19, 29 RGB 16, 19, 29
RGB 00, 00, 00 RGB 00, 00, 00
; $48
RGB 31, 31, 31 RGB 31, 31, 31
RGB 16, 02, 30 RGB 16, 02, 30
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $49
RGB 31, 31, 31 RGB 31, 31, 31
RGB 16, 13, 04 RGB 16, 13, 04
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $4a
RGB 31, 31, 31 RGB 31, 31, 31
RGB 28, 04, 02 RGB 28, 04, 02
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $4b
RGB 31, 31, 31 RGB 31, 31, 31
RGB 18, 23, 31 RGB 18, 23, 31
RGB 15, 20, 31 RGB 15, 20, 31
RGB 00, 00, 00 RGB 00, 00, 00
; $4c
RGB 31, 31, 31 RGB 31, 31, 31
RGB 24, 20, 11 RGB 24, 20, 11
RGB 18, 13, 11 RGB 18, 13, 11
RGB 00, 00, 00 RGB 00, 00, 00
; $4d
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 31, 31 RGB 31, 31, 31
RGB 25, 30, 00 RGB 25, 30, 00
RGB 25, 30, 00 RGB 25, 30, 00
; $4e
RGB 00, 00, 00 RGB 00, 00, 00
RGB 08, 11, 11 RGB 08, 11, 11
RGB 21, 21, 21 RGB 21, 21, 21

227
data/palettes/tileset_bg.pal
View File

@@ -1,227 +0,0 @@
; morn
; gray
RGB 28, 31, 16
RGB 21, 21, 21
RGB 13, 13, 13
RGB 07, 07, 07
; red
RGB 28, 31, 16
RGB 31, 19, 24
RGB 30, 10, 06
RGB 07, 07, 07
; green
RGB 22, 31, 10
RGB 12, 25, 01
RGB 05, 14, 00
RGB 07, 07, 07
; water
RGB 31, 31, 31
RGB 08, 12, 31
RGB 01, 04, 31
RGB 07, 07, 07
; yellow
RGB 28, 31, 16
RGB 31, 31, 07
RGB 31, 16, 01
RGB 07, 07, 07
; brown
RGB 28, 31, 16
RGB 24, 18, 07
RGB 20, 15, 03
RGB 07, 07, 07
; roof
RGB 28, 31, 16
RGB 15, 31, 31
RGB 05, 17, 31
RGB 07, 07, 07
; text
RGB 31, 31, 16
RGB 31, 31, 16
RGB 14, 09, 00
RGB 00, 00, 00
; day
; gray
RGB 27, 31, 27
RGB 21, 21, 21
RGB 13, 13, 13
RGB 07, 07, 07
; red
RGB 27, 31, 27
RGB 31, 19, 24
RGB 30, 10, 06
RGB 07, 07, 07
; green
RGB 22, 31, 10
RGB 12, 25, 01
RGB 05, 14, 00
RGB 07, 07, 07
; water
RGB 31, 31, 31
RGB 08, 12, 31
RGB 01, 04, 31
RGB 07, 07, 07
; yellow
RGB 27, 31, 27
RGB 31, 31, 07
RGB 31, 16, 01
RGB 07, 07, 07
; brown
RGB 27, 31, 27
RGB 24, 18, 07
RGB 20, 15, 03
RGB 07, 07, 07
; roof
RGB 27, 31, 27
RGB 15, 31, 31
RGB 05, 17, 31
RGB 07, 07, 07
; text
RGB 31, 31, 16
RGB 31, 31, 16
RGB 14, 09, 00
RGB 00, 00, 00
; nite
; gray
RGB 15, 14, 24
RGB 11, 11, 19
RGB 07, 07, 12
RGB 00, 00, 00
; red
RGB 15, 14, 24
RGB 14, 07, 17
RGB 13, 00, 08
RGB 00, 00, 00
; green
RGB 15, 14, 24
RGB 08, 13, 19
RGB 00, 11, 13
RGB 00, 00, 00
; water
RGB 15, 14, 24
RGB 05, 05, 17
RGB 03, 03, 10
RGB 00, 00, 00
; yellow
RGB 30, 30, 11
RGB 16, 14, 18
RGB 16, 14, 10
RGB 00, 00, 00
; brown
RGB 15, 14, 24
RGB 12, 09, 15
RGB 08, 04, 05
RGB 00, 00, 00
; roof
RGB 15, 14, 24
RGB 13, 12, 23
RGB 11, 09, 20
RGB 00, 00, 00
; text
RGB 31, 31, 16
RGB 31, 31, 16
RGB 14, 09, 00
RGB 00, 00, 00
; dark
; gray
RGB 01, 01, 02
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
; red
RGB 01, 01, 02
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
; green
RGB 01, 01, 02
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
; water
RGB 01, 01, 02
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
; yellow
RGB 30, 30, 11
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
; brown
RGB 01, 01, 02
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
; roof
RGB 01, 01, 02
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
; text
RGB 31, 31, 16
RGB 31, 31, 16
RGB 14, 09, 00
RGB 00, 00, 00
; indoor
; gray
RGB 30, 28, 26
RGB 19, 19, 19
RGB 13, 13, 13
RGB 07, 07, 07
; red
RGB 30, 28, 26
RGB 31, 19, 24
RGB 30, 10, 06
RGB 07, 07, 07
; green
RGB 18, 24, 09
RGB 15, 20, 01
RGB 09, 13, 00
RGB 07, 07, 07
; water
RGB 30, 28, 26
RGB 15, 16, 31
RGB 09, 09, 31
RGB 07, 07, 07
; yellow
RGB 30, 28, 26
RGB 31, 31, 07
RGB 31, 16, 01
RGB 07, 07, 07
; brown
RGB 26, 24, 17
RGB 21, 17, 07
RGB 16, 13, 03
RGB 07, 07, 07
; roof
RGB 30, 28, 26
RGB 17, 19, 31
RGB 14, 16, 31
RGB 07, 07, 07
; text
RGB 31, 31, 16
RGB 31, 31, 16
RGB 14, 09, 00
RGB 00, 00, 00
; overworld water
; morn/day
RGB 23, 23, 31
RGB 18, 19, 31
RGB 13, 12, 31
RGB 07, 07, 07
; nite
RGB 15, 13, 27
RGB 10, 09, 20
RGB 04, 03, 18
RGB 00, 00, 00

0
data/palettes/49757.pal → data/palettes/unknown/49757.pal
View File

15
data/palettes/unknown/4985a.asm Normal file
View File

@@ -0,0 +1,15 @@
db $ab, $03, $57, $24, $ac, $0e, $13, $32
db $be, $30, $5b, $4c, $47, $60, $ed, $f2
db $ab, $03, $55, $26, $aa, $0a, $13, $3a
db $be, $28, $33, $24, $6e, $71, $df, $b0
db $a8, $00, $e5, $e0, $9a, $fc, $f4, $2c
db $fe, $4c, $a3, $5e, $c6, $3a, $ab, $4d
db $a8, $00, $b5, $b0, $de, $e8, $fc, $1c
db $ba, $66, $f7, $0e, $ba, $5e, $43, $bd

0
data/palettes/b6f1.pal → data/palettes/unknown/b6f1.pal
View File

0
data/palettes/b719.pal → data/palettes/unknown/b719.pal
View File

0
data/palettes/b789.pal → data/palettes/unknown/b789.pal
View File

2
data/sgb_border_map.asm
View File

@@ -1,4 +1,4 @@
SGBBorderMap:
db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $14, $14, $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54, $14, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14 db $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $14, $14, $15, $14, $16, $14, $17, $14, $17, $54, $16, $54, $15, $54, $14, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14
db $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54, $24, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $54, $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54 db $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $25, $14, $26, $14, $07, $14, $07, $54, $26, $54, $25, $54, $24, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $54, $01, $14, $02, $14, $03, $14, $03, $54, $02, $54, $01, $54
db $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54, $10, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $34, $14, $35, $14, $35, $54, $34, $54, $33, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $10, $14, $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54 db $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54, $10, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $24, $14, $34, $14, $35, $14, $35, $54, $34, $54, $33, $54, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $07, $14, $10, $14, $11, $14, $12, $14, $13, $14, $13, $54, $12, $54, $11, $54

18
data/unown_words.asm
View File

@@ -38,15 +38,15 @@ UnownWords: ; fba5a
dw UnownWord26 dw UnownWord26
; fba90 ; fba90
UnownWord1: unownword "ANGRY" UnownWord1: unownword "ANGRY"
UnownWord2: unownword "BEAR" UnownWord2: unownword "BEAR"
UnownWord3: unownword "CHASE" UnownWord3: unownword "CHASE"
UnownWord4: unownword "DIRECT" UnownWord4: unownword "DIRECT"
UnownWord5: unownword "ENGAGE" UnownWord5: unownword "ENGAGE"
UnownWord6: unownword "FIND" UnownWord6: unownword "FIND"
UnownWord7: unownword "GIVE" UnownWord7: unownword "GIVE"
UnownWord8: unownword "HELP" UnownWord8: unownword "HELP"
UnownWord9: unownword "INCREASE" UnownWord9: unownword "INCREASE"
UnownWord10: unownword "JOIN" UnownWord10: unownword "JOIN"
UnownWord11: unownword "KEEP" UnownWord11: unownword "KEEP"
UnownWord12: unownword "LAUGH" UnownWord12: unownword "LAUGH"

6
engine/cgb_layouts.asm
View File

@@ -145,7 +145,7 @@ _CGB_FinishBattleScreenLayout: ; 8e23
ld bc, 6 * SCREEN_WIDTH ld bc, 6 * SCREEN_WIDTH
ld a, PAL_BATTLE_BG_TEXT ld a, PAL_BATTLE_BG_TEXT
call ByteFill call ByteFill
ld hl, Palettes_979c ld hl, BattleObjectPals
ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY
ld bc, 6 palettes ld bc, 6 palettes
ld a, BANK(UnknOBPals) ld a, BANK(UnknOBPals)
@@ -621,8 +621,8 @@ _CGB_Evolution: ; 91e4
ld a, [PlayerHPPal] ld a, [PlayerHPPal]
call GetPlayerOrMonPalettePointer call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
ld hl, Palettes_979c ld hl, BattleObjectPals
ld de, UnknOBPals palette 2 ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY
ld bc, 6 palettes ld bc, 6 palettes
ld a, BANK(UnknOBPals) ld a, BANK(UnknOBPals)
call FarCopyWRAM call FarCopyWRAM

193
engine/color.asm
View File

@@ -43,6 +43,7 @@ CheckShininess:
and a and a
ret ret
; unreferenced
CheckContestMon: CheckContestMon:
; Check a mon's DVs at hl in the bug catching contest. ; Check a mon's DVs at hl in the bug catching contest.
; Return carry if its DVs are good enough to place in the contest. ; Return carry if its DVs are good enough to place in the contest.
@@ -108,7 +109,8 @@ InitPartyMenuPalettes:
call WipeAttrMap call WipeAttrMap
ret ret
SGB_ApplyPartyMenuHPPals: ; 8ade SGB layout $fc ; SGB layout for SCGB_PARTY_MENU_HP_PALS
SGB_ApplyPartyMenuHPPals: ; 8ade
ld hl, wHPPals ld hl, wHPPals
ld a, [wSGBPals] ld a, [wSGBPals]
ld e, a ld e, a
@@ -343,11 +345,11 @@ ApplyHPBarPals:
ret ret
.Enemy: .Enemy:
ld de, BGPals + 2 palettes + 2 ld de, BGPals palette PAL_BATTLE_BG_ENEMY_HP + 2
jr .okay jr .okay
.Player: .Player:
ld de, BGPals + 3 palettes + 2 ld de, BGPals palette PAL_BATTLE_BG_PLAYER_HP + 2
.okay .okay
ld l, c ld l, c
@@ -395,11 +397,11 @@ LoadStatsScreenPals:
ld a, $5 ld a, $5
ld [rSVBK], a ld [rSVBK], a
ld a, [hli] ld a, [hli]
ld [UnknBGPals], a ld [UnknBGPals palette 0], a
ld [UnknBGPals + 8 * 2], a ld [UnknBGPals palette 2], a
ld a, [hl] ld a, [hl]
ld [UnknBGPals + 1], a ld [UnknBGPals palette 0 + 1], a
ld [UnknBGPals + 8 * 2 + 1], a ld [UnknBGPals palette 2 + 1], a
pop af pop af
ld [rSVBK], a ld [rSVBK], a
call ApplyPals call ApplyPals
@@ -457,7 +459,7 @@ Function95f0:
; XXX ; XXX
ld hl, .Palette ld hl, .Palette
ld de, UnknBGPals ld de, UnknBGPals
ld bc, 8 ld bc, 1 palettes
ld a, $5 ld a, $5
call FarCopyWRAM call FarCopyWRAM
call ApplyPals call ApplyPals
@@ -521,10 +523,10 @@ LoadPalette_White_Col1_Col2_Black:
ld a, $5 ld a, $5
ld [rSVBK], a ld [rSVBK], a
ld a, $7fff % $100 ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld [de], a ld [de], a
inc de inc de
ld a, $7fff / $100 ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld [de], a ld [de], a
inc de inc de
@@ -574,7 +576,7 @@ ResetBGPals:
ld [rSVBK], a ld [rSVBK], a
ld hl, UnknBGPals ld hl, UnknBGPals
ld c, 8 ld c, 1 palettes
.loop .loop
ld a, $ff ld a, $ff
ld [hli], a ld [hli], a
@@ -655,7 +657,8 @@ ApplyAttrMap:
ld [rVBK], a ld [rVBK], a
ret ret
CGB_ApplyPartyMenuHPPals: ; 96f3 CGB layout $fc ; CGB layout for SCGB_PARTY_MENU_HP_PALS
CGB_ApplyPartyMenuHPPals: ; 96f3
ld hl, wHPPals ld hl, wHPPals
ld a, [wSGBPals] ld a, [wSGBPals]
ld e, a ld e, a
@@ -746,7 +749,7 @@ GetMonPalettePointer_:
Function9779: mobile Function9779: mobile
call CheckCGB call CheckCGB
ret z ret z
ld hl, Palettes_979c ld hl, BattleObjectPals
ld a, $90 ld a, $90
ld [rOBPI], a ld [rOBPI], a
ld c, 6 palettes ld c, 6 palettes
@@ -755,15 +758,15 @@ Function9779: mobile
ld [rOBPD], a ld [rOBPD], a
dec c dec c
jr nz, .loop jr nz, .loop
ld hl, Palettes_979c ld hl, BattleObjectPals
ld de, UnknOBPals palette 2 ld de, UnknOBPals palette 2
ld bc, 2 palettes ld bc, 2 palettes
ld a, $5 ld a, $5
call FarCopyWRAM call FarCopyWRAM
ret ret
Palettes_979c: BattleObjectPals:
INCLUDE "data/palettes/979c.pal" INCLUDE "data/palettes/battle_objects.pal"
Function97cc: Function97cc:
; XXX ; XXX
@@ -909,9 +912,9 @@ InitCGBPals::
ld [rBGPI], a ld [rBGPI], a
ld c, 4 * 8 ld c, 4 * 8
.bgpals_loop .bgpals_loop
ld a, $7fff % $100 ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld [rBGPD], a ld [rBGPD], a
ld a, $7fff / $100 ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld [rBGPD], a ld [rBGPD], a
dec c dec c
jr nz, .bgpals_loop jr nz, .bgpals_loop
@@ -919,9 +922,9 @@ InitCGBPals::
ld [rOBPI], a ld [rOBPI], a
ld c, 4 * 8 ld c, 4 * 8
.obpals_loop .obpals_loop
ld a, $7fff % $100 ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld [rOBPD], a ld [rOBPD], a
ld a, $7fff / $100 ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld [rOBPD], a ld [rOBPD], a
dec c dec c
jr nz, .obpals_loop jr nz, .obpals_loop
@@ -940,9 +943,9 @@ InitCGBPals::
.LoadWhitePals: .LoadWhitePals:
ld c, 4 * 16 ld c, 4 * 16
.loop .loop
ld a, $7fff % $100 ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld [hli], a ld [hli], a
ld a, $7fff / $100 ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld [hli], a ld [hli], a
dec c dec c
jr nz, .loop jr nz, .loop
@@ -1006,7 +1009,7 @@ PushSGBBorder:
SGB_ClearVRAM: SGB_ClearVRAM:
ld hl, VTiles0 ld hl, VTiles0
ld bc, $2000 ld bc, VRAM_End - VTiles0
xor a xor a
call ByteFill call ByteFill
ret ret
@@ -1194,90 +1197,13 @@ SGBDelayCycles:
jr nz, .wait jr nz, .wait
ret ret
BlkPacket_9a86: INCLUDE "data/palettes/blk_packets.asm"
db $21, $01, $03, $00, $00, $00, $13, $11, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9a96: INCLUDE "data/palettes/pal_packets.asm"
db $21, $01, $07, $05, $00, $0a, $13, $0d, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9aa6:
db $22, $05, $07, $0a, $00, $0c, $13, $11, $03, $05, $01, $00, $0a, $03, $03, $00
db $0a, $08, $13, $0a, $03, $0a, $00, $04, $08, $0b, $03, $0f, $0b, $00, $13, $07
BlkPacket_9ac6:
db $21, $01, $07, $05, $00, $01, $07, $07, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9ad6:
db $21, $01, $07, $05, $0b, $01, $13, $02, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9ae6:
db $21, $01, $07, $05, $01, $01, $08, $08, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9af6:
db $21, $01, $07, $05, $07, $05, $0d, $0b, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9b06:
db $22, $05, $03, $05, $00, $00, $13, $0b, $03, $0a, $00, $04, $13, $09, $02, $0f
db $00, $06, $13, $07, $03, $00, $04, $04, $0f, $09, $03, $00, $00, $0c, $13, $11
BlkPacket_9b26:
db $23, $07, $07, $10, $00, $00, $02, $0c, $02, $00, $0c, $00, $12, $01, $02, $00
db $0c, $02, $12, $03, $02, $00, $0c, $04, $12, $05, $02, $00, $0c, $06, $12, $07
db $02, $00, $0c, $08, $12, $09, $02, $00, $0c, $0a, $12, $0b, $00, $00, $00, $00
BlkPacket_9b56:
db $22, $03, $07, $20, $00, $00, $13, $04, $03, $0f, $00, $06, $13, $11, $03, $05
db $0f, $01, $12, $04, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9b76:
db $21, $01, $07, $10, $00, $00, $13, $05, $00, $00, $00, $00, $00, $00, $00, $00
BlkPacket_9b86:
db $21, $02, $07, $0a, $00, $04, $13, $0d, $03, $05, $00, $06, $13, $0b, $00, $00
PalPacket_9b96: db $51, $48, $00, $49, $00, $4a, $00, $4b, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9ba6: db $51, $2b, $00, $24, $00, $20, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9bb6: db $51, $41, $00, $42, $00, $43, $00, $44, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9bc6: db $51, $4c, $00, $4c, $00, $4c, $00, $4c, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9bd6: db $51, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9be6: db $51, $36, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9bf6: db $51, $37, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c06: db $51, $38, $00, $39, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c16: db $51, $3a, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c26: db $51, $3b, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c36: db $51, $3c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c46: db $51, $39, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c56: db $51, $2e, $00, $2f, $00, $30, $00, $31, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c66: db $51, $1a, $00, $1a, $00, $1a, $00, $1a, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c76: db $51, $32, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c86: db $51, $3c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9c96: db $51, $3d, $00, $3e, $00, $3f, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9ca6: db $51, $33, $00, $34, $00, $1b, $00, $1f, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9cb6: db $51, $1b, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9cc6: db $51, $1c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9cd6: db $51, $35, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9ce6: db $01, $ff, $7f, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9cf6: db $09, $ff, $7f, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d06: db $59, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d16: db $89, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d26: db $89, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d36: db $99, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d46: db $a1, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d56: db $b9, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d66: db $b9, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d76: db $79, $5d, $08, $00, $0b, $8c, $d0, $f4, $60, $00, $00, $00, $00, $00, $00, $00
PalPacket_9d86: db $79, $52, $08, $00, $0b, $a9, $e7, $9f, $01, $c0, $7e, $e8, $e8, $e8, $e8, $e0
PalPacket_9d96: db $79, $47, $08, $00, $0b, $c4, $d0, $16, $a5, $cb, $c9, $05, $d0, $10, $a2, $28
PalPacket_9da6: db $79, $3c, $08, $00, $0b, $f0, $12, $a5, $c9, $c9, $c8, $d0, $1c, $a5, $ca, $c9
PalPacket_9db6: db $79, $31, $08, $00, $0b, $0c, $a5, $ca, $c9, $7e, $d0, $06, $a5, $cb, $c9, $7e
PalPacket_9dc6: db $79, $26, $08, $00, $0b, $39, $cd, $48, $0c, $d0, $34, $a5, $c9, $c9, $80, $d0
PalPacket_9dd6: db $79, $1b, $08, $00, $0b, $ea, $ea, $ea, $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0
PalPacket_9de6: db $79, $10, $08, $00, $0b, $4c, $20, $08, $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea
PredefPals: PredefPals:
INCLUDE "data/palettes/predef.pal" INCLUDE "data/palettes/predef.pal"
SGBBorderMap:
INCLUDE "data/sgb_border_map.asm" INCLUDE "data/sgb_border_map.asm"
SGBBorderPalettes: SGBBorderPalettes:
@@ -1287,20 +1213,10 @@ SGBBorder:
INCBIN "gfx/sgb/sgb_border.2bpp" INCBIN "gfx/sgb/sgb_border.2bpp"
HPBarPals: HPBarPals:
; green INCLUDE "data/palettes/hp_bar.pal"
RGB 30, 26, 15
RGB 00, 23, 00
; yellow
RGB 30, 26, 15
RGB 31, 21, 00
; red
RGB 30, 26, 15
RGB 31, 00, 00
ExpBarPalette: ExpBarPalette:
; blue INCLUDE "data/palettes/exp_bar.pal"
RGB 30, 26, 15
RGB 04, 17, 31
INCLUDE "gfx/pics/palette_pointers.asm" INCLUDE "gfx/pics/palette_pointers.asm"
INCLUDE "gfx/trainer_palettes.asm" INCLUDE "gfx/trainer_palettes.asm"
@@ -1314,7 +1230,7 @@ LoadMapPals:
and 7 and 7
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, .TilesetColorsPointers ld hl, EnvironmentColorsPointers
add hl, de add hl, de
add hl, de add hl, de
ld a, [hli] ld a, [hli]
@@ -1405,40 +1321,7 @@ endr
call FarCopyWRAM call FarCopyWRAM
ret ret
.TilesetColorsPointers: INCLUDE "data/maps/environment_colors.asm"
dw .OutdoorColors ; unused
dw .OutdoorColors ; TOWN
dw .OutdoorColors ; ROUTE
dw .IndoorColors ; INDOOR
dw .DungeonColors ; CAVE
dw .Perm5Colors ; ENVIRONMENT_5
dw .IndoorColors ; GATE
dw .DungeonColors ; DUNGEON
; Valid indices: $00 - $29
.OutdoorColors:
db $00, $01, $02, $28, $04, $05, $06, $07 ; morn
db $08, $09, $0a, $28, $0c, $0d, $0e, $0f ; day
db $10, $11, $12, $29, $14, $15, $16, $17 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark
.IndoorColors:
db $20, $21, $22, $23, $24, $25, $26, $07 ; morn
db $20, $21, $22, $23, $24, $25, $26, $07 ; day
db $10, $11, $12, $13, $14, $15, $16, $07 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $07 ; dark
.DungeonColors:
db $00, $01, $02, $03, $04, $05, $06, $07 ; morn
db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day
db $10, $11, $12, $13, $14, $15, $16, $17 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark
.Perm5Colors:
db $00, $01, $02, $03, $04, $05, $06, $07 ; morn
db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day
db $10, $11, $12, $13, $14, $15, $16, $17 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark
Palette_b309: ; b309 mobile Palette_b309: ; b309 mobile
RGB 31, 31, 31 RGB 31, 31, 31
@@ -1453,13 +1336,13 @@ Palette_b311: ; b311 not mobile
RGB 00, 00, 00 RGB 00, 00, 00
TilesetBGPalette: TilesetBGPalette:
INCLUDE "data/palettes/tileset_bg.pal" INCLUDE "data/palettes/overworld/tileset_bg.pal"
MapObjectPals:: MapObjectPals::
INCLUDE "data/palettes/map_objects.pal" INCLUDE "data/palettes/overworld/map_objects.pal"
RoofPals: RoofPals:
INCLUDE "data/palettes/roofs.pal" INCLUDE "data/palettes/overworld/roofs.pal"
DiplomaPalettes: DiplomaPalettes:
INCLUDE "data/palettes/diploma.pal" INCLUDE "data/palettes/diploma.pal"
@@ -1468,10 +1351,10 @@ PartyMenuOBPals:
INCLUDE "data/palettes/party_menu.pal" INCLUDE "data/palettes/party_menu.pal"
Palettes_b6f1: Palettes_b6f1:
INCLUDE "data/palettes/b6f1.pal" INCLUDE "data/palettes/unknown/b6f1.pal"
Palettes_b719: Palettes_b719:
INCLUDE "data/palettes/b719.pal" INCLUDE "data/palettes/unknown/b719.pal"
MalePokegearPals: MalePokegearPals:
INCLUDE "data/palettes/pokegear.pal" INCLUDE "data/palettes/pokegear.pal"
@@ -1480,7 +1363,7 @@ FemalePokegearPals:
INCLUDE "data/palettes/pokegear_f.pal" INCLUDE "data/palettes/pokegear_f.pal"
Palettes_b789: Palettes_b789:
INCLUDE "data/palettes/b789.pal" INCLUDE "data/palettes/unknown/b789.pal"
SlotMachinePals: SlotMachinePals:
INCLUDE "data/palettes/slot_machine.pal" INCLUDE "data/palettes/slot_machine.pal"

34
engine/crystal_colors.asm
View File

@@ -126,10 +126,7 @@ LoadOW_BGPal7:: ; 49409
; 49418 ; 49418
Palette_TextBG7: ; 49418 Palette_TextBG7: ; 49418
RGB 31, 31, 31 INCLUDE "data/palettes/overworld/bg_text.pal"
RGB 08, 19, 28
RGB 05, 05, 16
RGB 00, 00, 00
; 49420 ; 49420
Function49420:: ; 49420 (12:5420) Function49420:: ; 49420 (12:5420)
@@ -144,7 +141,7 @@ Function49420:: ; 49420 (12:5420)
MG_Mobile_Layout01: ; 4942f MG_Mobile_Layout01: ; 4942f
call MG_Mobile_Layout_LoadPals call MG_Mobile_Layout_LoadPals
ld de, UnknBGPals palette PAL_BG_TEXT ld de, UnknBGPals palette PAL_BG_TEXT
ld hl, Palette_49478 ld hl, .Palette_49478
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(UnknBGPals) ld a, BANK(UnknBGPals)
call FarCopyWRAM call FarCopyWRAM
@@ -174,7 +171,7 @@ MG_Mobile_Layout01: ; 4942f
ret ret
; 49478 ; 49478
Palette_49478: ; 49478 .Palette_49478: ; 49478
RGB 31, 31, 31 RGB 31, 31, 31
RGB 26, 31, 00 RGB 26, 31, 00
RGB 20, 16, 03 RGB 20, 16, 03
@@ -210,7 +207,7 @@ Function49496: ; 49496
INCLUDE "tilesets/special_palettes.asm" INCLUDE "tilesets/special_palettes.asm"
MG_Mobile_Layout02: ; 49706 MG_Mobile_Layout02: ; 49706
ld hl, Palette_49732 ld hl, .Palette_49732
ld de, UnknBGPals ld de, UnknBGPals
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(UnknBGPals) ld a, BANK(UnknBGPals)
@@ -218,7 +215,7 @@ MG_Mobile_Layout02: ; 49706
farcall ApplyPals farcall ApplyPals
call MG_Mobile_Layout_WipeAttrMap call MG_Mobile_Layout_WipeAttrMap
farcall ApplyAttrMap farcall ApplyAttrMap
ld hl, Palette_4973a ld hl, .Palette_4973a
ld de, UnknOBPals ld de, UnknOBPals
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(UnknOBPals) ld a, BANK(UnknOBPals)
@@ -226,14 +223,14 @@ MG_Mobile_Layout02: ; 49706
ret ret
; 49732 ; 49732
Palette_49732: ; 49732 .Palette_49732: ; 49732
RGB 31, 31, 31 RGB 31, 31, 31
RGB 23, 16, 07 RGB 23, 16, 07
RGB 23, 07, 07 RGB 23, 07, 07
RGB 03, 07, 20 RGB 03, 07, 20
; 4973a ; 4973a
Palette_4973a: ; 4973a .Palette_4973a: ; 4973a
RGB 00, 00, 00 RGB 00, 00, 00
RGB 07, 05, 31 RGB 07, 05, 31
RGB 14, 18, 31 RGB 14, 18, 31
@@ -241,17 +238,17 @@ Palette_4973a: ; 4973a
; 49742 ; 49742
Function49742: ; 49742 Function49742: ; 49742
ld hl, Palette_49757 ld hl, .Palette_49757
ld de, UnknBGPals ld de, UnknBGPals
ld bc, $40 ld bc, 8 palettes
ld a, $5 ld a, $5
call FarCopyWRAM call FarCopyWRAM
farcall ApplyPals farcall ApplyPals
ret ret
; 49757 ; 49757
Palette_49757: ; 49757 .Palette_49757: ; 49757
INCLUDE "data/palettes/49757.pal" INCLUDE "data/palettes/unknown/49757.pal"
; 49797 ; 49797
_InitMG_Mobile_LinkTradePalMap: ; 49797 _InitMG_Mobile_LinkTradePalMap: ; 49797
@@ -326,11 +323,4 @@ InitMG_Mobile_LinkTradePalMap: ; 49856
; 4985a ; 4985a
Unknown_4985a: ; unreferenced Unknown_4985a: ; unreferenced
db $ab, $03, $57, $24, $ac, $0e, $13, $32 INCLUDE "data/palettes/unknown/4985a.asm"
db $be, $30, $5b, $4c, $47, $60, $ed, $f2
db $ab, $03, $55, $26, $aa, $0a, $13, $3a
db $be, $28, $33, $24, $6e, $71, $df, $b0
db $a8, $00, $e5, $e0, $9a, $fc, $f4, $2c
db $fe, $4c, $a3, $5e, $c6, $3a, $ab, $4d
db $a8, $00, $b5, $b0, $de, $e8, $fc, $1c
db $ba, $66, $f7, $0e, $ba, $5e, $43, $bd

7
main.asm
View File

@@ -85,9 +85,16 @@ INCLUDE "event/daycare.asm"
INCLUDE "event/print_unown.asm" INCLUDE "event/print_unown.asm"
INCLUDE "event/print_photo.asm" INCLUDE "event/print_photo.asm"
INCLUDE "engine/breeding.asm" INCLUDE "engine/breeding.asm"
INCLUDE "tilesets/data.asm" INCLUDE "tilesets/data.asm"
SECTION "Roofs", ROMX
INCLUDE "tilesets/roofs.asm"
SECTION "Clock Reset", ROMX SECTION "Clock Reset", ROMX
INCLUDE "engine/clock_reset.asm" INCLUDE "engine/clock_reset.asm"

1
tilesets/animations.asm
View File

@@ -1,4 +1,3 @@
_AnimateTileset:: ; fc000 _AnimateTileset:: ; fc000
; Iterate over a given pointer array of ; Iterate over a given pointer array of
; animation functions (one per frame). ; animation functions (one per frame).

5
tilesets/data.asm
View File

@@ -1,8 +1,3 @@
SECTION "Roofs", ROMX
INCLUDE "tilesets/roofs.asm"
SECTION "Tileset Data 1", ROMX SECTION "Tileset Data 1", ROMX
TilesetKantoGFX: ; 0x18000 TilesetKantoGFX: ; 0x18000

0
tilesets/battle_tower.pal → tilesets/palettes/battle_tower.pal
View File

0
tilesets/house_1.pal → tilesets/palettes/house_1.pal
View File

0
tilesets/ice_path.pal → tilesets/palettes/ice_path.pal
View File

0
tilesets/pokecom_center.pal → tilesets/palettes/pokecom_center.pal
View File

0
tilesets/radio_tower.pal → tilesets/palettes/radio_tower.pal
View File

9
tilesets/roofs.asm
View File

@@ -18,12 +18,3 @@ LoadMapGroupRoof:: ; 1c000
INCLUDE "data/maps/mapgroup_roofs.asm" INCLUDE "data/maps/mapgroup_roofs.asm"
Roofs: ; 1c03c
INCBIN "gfx/tilesets/roofs/0.2bpp"
INCBIN "gfx/tilesets/roofs/1.2bpp"
INCBIN "gfx/tilesets/roofs/2.2bpp"
INCBIN "gfx/tilesets/roofs/3.2bpp"
INCBIN "gfx/tilesets/roofs/4.2bpp"
; 1c30c

10
tilesets/special_palettes.asm
View File

@@ -63,7 +63,7 @@ LoadPokeComPalette: ; 494f2
; 49501 ; 49501
PokeComPalette: ; 49501 PokeComPalette: ; 49501
INCLUDE "tilesets/pokecom_center.pal" INCLUDE "tilesets/palettes/pokecom_center.pal"
; 49541 ; 49541
LoadBattleTowerPalette: ; 49541 LoadBattleTowerPalette: ; 49541
@@ -76,7 +76,7 @@ LoadBattleTowerPalette: ; 49541
; 49550 ; 49550
BattleTowerPalette: ; 49550 BattleTowerPalette: ; 49550
INCLUDE "tilesets/battle_tower.pal" INCLUDE "tilesets/palettes/battle_tower.pal"
; 49590 ; 49590
LoadIcePathPalette: ; 49590 LoadIcePathPalette: ; 49590
@@ -89,7 +89,7 @@ LoadIcePathPalette: ; 49590
; 4959f ; 4959f
IcePathPalette: ; 4959f IcePathPalette: ; 4959f
INCLUDE "tilesets/ice_path.pal" INCLUDE "tilesets/palettes/ice_path.pal"
; 495df ; 495df
LoadHousePalette: ; 495df LoadHousePalette: ; 495df
@@ -102,7 +102,7 @@ LoadHousePalette: ; 495df
; 495ee ; 495ee
HousePalette: ; 495ee HousePalette: ; 495ee
INCLUDE "tilesets/house_1.pal" INCLUDE "tilesets/palettes/house_1.pal"
; 4962e ; 4962e
LoadRadioTowerPalette: ; 4962e LoadRadioTowerPalette: ; 4962e
@@ -115,7 +115,7 @@ LoadRadioTowerPalette: ; 4962e
; 4963d ; 4963d
RadioTowerPalette: ; 4963d RadioTowerPalette: ; 4963d
INCLUDE "tilesets/radio_tower.pal" INCLUDE "tilesets/palettes/radio_tower.pal"
; 4967d ; 4967d
MansionPalette1: ; 4967d MansionPalette1: ; 4967d