pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Detach PAL_OW_MISC from map palettes i.e. LoadMapPals (#3)

Browse Source
This commit is contained in:
xCrystal 2023-10-07 12:47:37 +02:00
parent 85a616e20e
commit da956ed7e4
6 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
constants/sprite_data_constants.asm
View File

@ -19,10 +19,10 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS
const PAL_OW_BLUE ; 1 const PAL_OW_BLUE ; 1
const PAL_OW_GREEN ; 2 const PAL_OW_GREEN ; 2
const PAL_OW_BROWN ; 3 const PAL_OW_BROWN ; 3
const PAL_OW_MISC ; 4 const PAL_OW_EMOTE ; 4
const PAL_OW_EMOTE ; 5 const PAL_OW_TREE ; 5
const PAL_OW_TREE ; 6 const PAL_OW_ROCK ; 6
const PAL_OW_ROCK ; 7 const PAL_OW_MISC ; 7
; object_events set bit 3 so as not to use the sprite's default palette ; object_events set bit 3 so as not to use the sprite's default palette
; MapObjectPals indexes (see gfx/overworld/npc_sprites.pal) ; MapObjectPals indexes (see gfx/overworld/npc_sprites.pal)

14
engine/gfx/color.asm
View File

@ -628,7 +628,7 @@ INCLUDE "data/pokemon/palettes.asm"
INCLUDE "data/trainers/palettes.asm" INCLUDE "data/trainers/palettes.asm"
LoadMapPals: LoadMapPals:
call LoadDarknessPaletteIfDark ; also handles darkness palettes call LoadDarknessPaletteIfDark
jr c, .got_pals jr c, .got_pals
; Which palette group is based on whether we're outside or inside ; Which palette group is based on whether we're outside or inside
@ -697,8 +697,8 @@ LoadMapPals:
jr nz, .not_darkness jr nz, .not_darkness
ld a, BANK(wOBPals1) ld a, BANK(wOBPals1)
ld de, wOBPals1 ld de, wOBPals1
ld hl, NPCDarknessPalette ld hl, MapObjectDarknessPals
ld bc, 8 palettes ld bc, 7 palettes
jp FarCopyWRAM jp FarCopyWRAM
.not_darkness .not_darkness
@ -708,7 +708,7 @@ LoadMapPals:
ld hl, MapObjectPals ld hl, MapObjectPals
call AddNTimes call AddNTimes
ld de, wOBPals1 ld de, wOBPals1
ld bc, 8 palettes ld bc, 7 palettes
ld a, BANK(wOBPals1) ld a, BANK(wOBPals1)
call FarCopyWRAM call FarCopyWRAM
@ -759,7 +759,7 @@ LoadDarknessPaletteIfDark:
LoadDarknessPalette: LoadDarknessPalette:
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
ld de, wBGPals1 ld de, wBGPals1
ld hl, DarknessPalette ld hl, TilesetBGDarknessPalette
ld bc, 8 palettes ld bc, 8 palettes
jp FarCopyWRAM jp FarCopyWRAM
@ -771,13 +771,13 @@ INCLUDE "gfx/stats/party_menu_bg_mobile.pal"
PartyMenuBGPalette: PartyMenuBGPalette:
INCLUDE "gfx/stats/party_menu_bg.pal" INCLUDE "gfx/stats/party_menu_bg.pal"
DarknessPalette: TilesetBGDarknessPalette:
INCLUDE "gfx/tilesets/bg_tiles_darkness.pal" INCLUDE "gfx/tilesets/bg_tiles_darkness.pal"
TilesetBGPalette: TilesetBGPalette:
INCLUDE "gfx/tilesets/bg_tiles.pal" INCLUDE "gfx/tilesets/bg_tiles.pal"
NPCDarknessPalette: MapObjectDarknessPals:
INCLUDE "gfx/overworld/npc_sprites_darkness.pal" INCLUDE "gfx/overworld/npc_sprites_darkness.pal"
MapObjectPals:: MapObjectPals::

8
gfx/overworld/npc_sprites.pal
View File

@ -3,37 +3,37 @@
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
RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown
RGB 28,31,16, 31,19,10, 30,10,06, 00,00,00 ; pink
RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
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
RGB 28,31,16, 31,19,10, 30,10,06, 00,00,00 ; misc (unused; not copied)
; 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
RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown
RGB 27,31,27, 31,19,10, 30,10,06, 00,00,00 ; pink
RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
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
RGB 27,31,27, 31,19,10, 30,10,06, 00,00,00 ; misc (unused; not copied)
; 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
RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown
RGB 15,14,24, 31,19,10, 30,10,06, 00,00,00 ; pink
RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
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
RGB 15,14,24, 31,19,10, 30,10,06, 00,00,00 ; misc (unused; not copied)
; eve ; eve
RGB 31,21,14, 31,19,10, 31,07,01, 00,00,00 ; red RGB 31,21,14, 31,19,10, 31,07,01, 00,00,00 ; red
RGB 31,21,14, 31,19,10, 10,09,31, 00,00,00 ; blue RGB 31,21,14, 31,19,10, 10,09,31, 00,00,00 ; blue
RGB 31,21,14, 31,19,10, 07,23,03, 00,00,00 ; green RGB 31,21,14, 31,19,10, 07,23,03, 00,00,00 ; green
RGB 31,21,14, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 31,21,14, 31,19,10, 15,10,03, 00,00,00 ; brown
RGB 31,21,14, 31,19,10, 30,10,06, 00,00,00 ; pink
RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
RGB 19,23,08, 10,19,01, 04,10,00, 06,05,05 ; tree RGB 19,23,08, 10,19,01, 04,10,00, 06,05,05 ; tree
RGB 31,21,14, 21,13,05, 16,09,01, 06,05,05 ; rock RGB 31,21,14, 21,13,05, 16,09,01, 06,05,05 ; rock
RGB 31,21,14, 31,19,10, 30,10,06, 00,00,00 ; misc (unused; not copied)

2
gfx/overworld/npc_sprites_darkness.pal
View File

@ -3,7 +3,7 @@
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
RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown
RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; pink
RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock
RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; misc (unused; not copied)

12
gfx/tilesets/bg_tiles.pal
View File

@ -1,3 +1,5 @@
; see data/maps/environment_colors.asm
; morn ; morn
RGB 28,31,16, 21,21,21, 13,13,13, 07,07,07 ; gray 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 28,31,16, 31,19,24, 30,10,06, 07,07,07 ; red
@ -6,7 +8,7 @@
RGB 28,31,16, 31,31,07, 31,16,01, 07,07,07 ; yellow 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, 24,18,07, 20,15,03, 07,07,07 ; brown
RGB 28,31,16, 15,31,31, 05,17,31, 07,07,07 ; roof (overwritten if outdoor env) RGB 28,31,16, 15,31,31, 05,17,31, 07,07,07 ; roof (overwritten if outdoor env)
RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (always overwritten) RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (unused)
; day ; day
RGB 27,31,27, 21,21,21, 13,13,13, 07,07,07 ; gray RGB 27,31,27, 21,21,21, 13,13,13, 07,07,07 ; gray
@ -16,7 +18,7 @@
RGB 27,31,27, 31,31,07, 31,16,01, 07,07,07 ; yellow 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, 24,18,07, 20,15,03, 07,07,07 ; brown
RGB 27,31,27, 15,31,31, 05,17,31, 07,07,07 ; roof (overwritten if outdoor env) RGB 27,31,27, 15,31,31, 05,17,31, 07,07,07 ; roof (overwritten if outdoor env)
RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (always overwritten) RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (unused)
; nite ; nite
RGB 15,14,24, 11,11,19, 07,07,12, 00,00,00 ; gray RGB 15,14,24, 11,11,19, 07,07,12, 00,00,00 ; gray
@ -26,7 +28,7 @@
RGB 30,30,11, 16,14,18, 16,14,10, 00,00,00 ; yellow 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, 12,09,15, 08,04,05, 00,00,00 ; brown
RGB 15,14,24, 13,12,23, 11,09,20, 00,00,00 ; roof (overwritten if outdoor env) RGB 15,14,24, 13,12,23, 11,09,20, 00,00,00 ; roof (overwritten if outdoor env)
RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (always overwritten) RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (unused)
; eve ; eve
RGB 31,21,14, 18,16,16, 11,10,10, 06,05,05 ; gray RGB 31,21,14, 18,16,16, 11,10,10, 06,05,05 ; gray
@ -36,7 +38,7 @@
RGB 31,31,07, 27,21,10, 25,12,01, 06,05,05 ; yellow RGB 31,31,07, 27,21,10, 25,12,01, 06,05,05 ; yellow
RGB 31,21,14, 21,13,05, 16,09,01, 06,05,05 ; brown RGB 31,21,14, 21,13,05, 16,09,01, 06,05,05 ; brown
RGB 31,21,14, 13,23,23, 04,13,23, 06,05,05 ; roof (overwritten if outdoor env) RGB 31,21,14, 13,23,23, 04,13,23, 06,05,05 ; roof (overwritten if outdoor env)
RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (always overwritten) RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (unused)
; building (morn/day) ; building (morn/day)
RGB 30,28,26, 19,19,19, 13,13,13, 07,07,07 ; gray RGB 30,28,26, 19,19,19, 13,13,13, 07,07,07 ; gray
@ -46,7 +48,7 @@
RGB 30,28,26, 31,31,07, 31,16,01, 07,07,07 ; yellow 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 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 (overwritten if outdoor env) RGB 30,28,26, 17,19,31, 14,16,31, 07,07,07 ; roof (overwritten if outdoor env)
RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (always overwritten) RGB 31,31,31, 31,31,16, 14,09,00, 00,00,00 ; text (unused)
; overworld water (outdoor) ; overworld water (outdoor)
RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; morn RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; morn

2
gfx/tilesets/bg_tiles_darkness.pal
View File

@ -1,3 +1,5 @@
; in darkness, these eight are always used rather than following environment colors indices
; dark ; 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 ; 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 ; red